* more rpm spec updates, to fix more rpmlint issues

eserte · Mar 17, 2013 · 7807bc5 · 7807bc5
1 parent 31e4d8d
commit 7807bc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 39 deletions.
diff --git a/port/rpm/bbbike.rpm.spec → port/rpm/BBBike.rpm.spec b/port/rpm/bbbike.rpm.spec → port/rpm/BBBike.rpm.spec
@@ -3,8 +3,8 @@
 Name: BBBike
 Version: 3.18
 Release: 1
-License: GPL
-Group: Applications/Productivity
+License: GPL-2.0
+Group: Productivity/Scientific/Other
 AutoReqProv: no
 # XXX once we build the "ext" stuff the following should be removed
 BuildArch: noarch

diff --git a/port/rpm/mkrpm.pl b/port/rpm/mkrpm.pl
@@ -8,8 +8,8 @@
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
 #
-# Mail: eserte@cs.tu-berlin.de
-# WWW:  http://user.cs.tu-berlin.de/~eserte/
+# Mail: slaven@rezic.de
+# WWW:  http://bbbike.sourceforge.net
 #
 
 use FindBin;
@@ -75,16 +75,18 @@
 
 my $need_318_fixes = $BBBike::SF_DISTFILE_SOURCE_ALT eq 'http://heanet.dl.sourceforge.net/project/bbbike/BBBike/3.18/BBBike-3.18.tar.gz';
 
-open my $RPM, ">", "bbbike.rpm.spec"
-    or die "Cannot write to bbbike.rpm.spec: $!";
+my $specfile = "BBBike.rpm.spec";
+
+open my $RPM, ">", $specfile
+    or die "Cannot write to $specfile: $!";
 print $RPM <<EOF;
 ### DO NOT EDIT! CREATED AUTOMATICALLY BY $0! ###
 %define __prefix        %{_prefix}
 Name: BBBike
 Version: $bbbike_version
 Release: $release
-License: GPL
-Group: Applications/Productivity
+License: GPL-2.0
+Group: Productivity/Scientific/Other
 AutoReqProv: no
 # XXX once we build the "ext" stuff the following should be removed
 BuildArch: noarch
@@ -201,42 +203,13 @@
 
 close $RPM
     or die $!;
-warn "INFO: Created RPM spec file as bbbike.rpm.spec\n";
+warn "INFO: Created RPM spec file as $specfile\n";
 
 if ($do_build) {
     warn "INFO: Building rpm...\n";
-    system 'rpm', "-bb", "bbbike.rpm.spec";
+    system 'rpm', "-bb", $specfile;
 } else {
     warn "INFO: No rpm build requested...\n";
 }
 
-# open(REL, ">.rpm.release") or die "Can't write release info";
-# print REL "$bbbike_version $release\n";
-# close REL;
-
 __END__
-
-=head1 TODO
-
-rpmlint warns on these:
-
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/Strassen-Inline2/ppport.h
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/Strassen-Inline/ppport.h
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/Strassen-Inline/heap.c
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/Strassen-Inline/heap.h
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/StrassenNetz-CNetFile/ppport.h
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/BBBikeXS/sqrt.h
-  BBBike.i586: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/BBBike/ext/BBBikeXS/sqrt.c
-
-Probably should be excluded --- how to do it, is there some exclude
-mechanism?
-
-Probably should also exclude these:
-
-  BBBike.i586: W: wrong-script-end-of-line-encoding /usr/lib/BBBike/bbbike.bat
-  BBBike.i586: W: wrong-script-end-of-line-encoding /usr/lib/BBBike/cbbbike.bat
-  BBBike.i586: W: wrong-script-end-of-line-encoding /usr/lib/BBBike/bbbike-activeperl.bat
-
-And also exclude all test files: */t/*.pl, */t/*.t
-
-=cut