Changeset 484 in ProjectBuilder

Timestamp:

Jun 9, 2008, 12:07:19 AM (16 years ago)

Author:

Bruno Cornec

Message:

Improve Fedora official package build

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/Env.pm (modified) (3 diffs)

devel/pb/bin/pb

@@ -971 +971 @@
 EOF
             }
+            if ($ddir eq "fedora") {
+                # Extract the spec file to please Fedora maintainers :-(
+                print PBS << "EOF";
+for p in $basesrc; do
+    echo \$p | grep -q 'src.rpm'
+    if [ \$\? -eq 0 ]; then
+        rpm2cpio \$p | cpio -ivdum --quiet '*.spec'
+    fi
+done
+EOF
+            }
         } elsif ($dtype eq "deb") {
             # Also make a pbscript to generate apt bases
@@ -986 +997 @@
 # Prepare a script to create apt info file
 (cd .. ; for a in i386 amd64 ia64; do mkdir -p dists/$dver/contrib/binary-\$a; dpkg-scanpackages -a\$a $dver /dev/null | gzip -c9 > dists/$dver/contrib/binary-\$a/Packages.gz; done; mkdir -p dists/$dver/contrib/source; dpkg-scansources $dver /dev/null | gzip -c9 > dists/$dver/contrib/source/Sources.gz)
+#(cd .. ; rm -f dists/$dver/Release ; apt-ftparchive release dists/$dver > dists/$dver/Release; gpg --sign -ba -o dists/$dver/Release.gpg dists/$dver/Release)
 EOF
         }

devel/pb/lib/ProjectBuilder/Env.pm

@@ -519 +519 @@
 
 # PBGRP is replaced by the RPM group of apps
+#filter PBGRP = Applications/Archiving
+
+# PBLIC is replaced by the license of the application
+#filter PBLIC = GPL
+
+# PBDEP is replaced by the list of dependencies
+#filter PBDEP =
+
+# PBSUF is replaced by the package suffix (\$pbsuf in code)
+filter PBSUF = \$pbsuf
+
+# PBOBS is replaced by the Obsolete line
+#filter PBOBS =
+
+EOF
+            close(CONF);
+            open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/fedora.pbf") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/fedora.pbf";
+            print CONF << "EOF";
+#
+# \$Id\$
+#
+# Filter for rpm build
+#
+
+# PBGRP is replaced by the RPM group of apps
 # Cf: http://fedoraproject.org/wiki/RPMGroups
 #filter PBGRP = Applications/Archiving
@@ -524 +549 @@
 # PBLIC is replaced by the license of the application
 # Cf: http://fedoraproject.org/wiki/Licensing
-#filter PBLIC = GPL
+#filter PBLIC = GPLv2+
 
 # PBDEP is replaced by the list of dependencies
@@ -530 +555 @@
 
 # PBSUF is replaced by the package suffix (\$pbsuf in code)
-filter PBSUF = \$pbsuf
+filter PBSUF = %{dist}
 
 # PBOBS is replaced by the Obsolete line