Changeset 153

Timestamp:

06/11/10 16:50:20 (14 years ago)

Author:

kdeugau

Message:

/trunk

Misc bugfixes and don't-cut-the-corner-case-ing

• Expand package data macros as well as 'globals' at a couple of points (may prove simpler to merge these two)
• gzip info pages as well as man pages
• expand manpage-directory references in %files so that we properly gzip them without having to specify Every. Last. Bloody. Page. when there are "many" in the set. NB: applies only to .../man/man<n>/, not .../man/
• make sure to expand %{_infodir} as "global data"

File:

• trunk/debbuild (modified) (5 diffs)

trunk/debbuild

@@ -599 +599 @@
       $subname = "main";
       if ($1) {       # Magic to add entries to the right package
-        my $tmp = expandmacros("$1", 'g');
+        my $tmp = expandmacros("$1", 'gp');
         if (/-n/) { $subname = $tmp; } else { $subname = "$pkgdata{main}{name}-$tmp"; }
       }
@@ -608 +608 @@
       $stage = 'package';
       if ($1) {       # Magic to add entries to the right package
-        my $tmp = expandmacros("$1", 'g');
+        my $tmp = expandmacros("$1", 'gp');
         if (/-n/) { $subname = $tmp; } else { $subname = "$pkgdata{main}{name}-$tmp"; }
       }
@@ -663 +663 @@
       $subname = 'main';
       if ($1) {       # Magic to add entries to the right list of files
-        my $tmp = expandmacros("$1", 'g');
+        my $tmp = expandmacros("$1", 'gp');
         if (/-n/) { $subname = $tmp; } else { $subname = "$pkgdata{main}{name}-$tmp"; }
       }
@@ -1098 +1098 @@
 
       # Feh.  Manpages don't **NEED** to be gzipped, but rpmbuild does, and so shall we.
-      if ($pkgfile =~ m|/usr/share/man/man|) {
+      # ... and your little info page too!
+      if ($pkgfile =~ m{/usr/share/(?:man/man|info)}) {
         # need to check to see if manpage is gzipped
         if (-e "$specglobals{buildroot}$pkgfile") {
-          if ($pkgfile !~ m|\.gz$|) {
-            qx { gzip $specglobals{buildroot}$pkgfile };
-            $pkgfile .= ".gz";
+          # if we've just been pointed to a manpage section with "many" pages,
+          # we need to gzip them all.
+          # fortunately, we do NOT need to explicitly track each file for the
+          # purpose of stuffing them in the package...  the original %files
+          # entry will do just fine.
+          if ( -d "$specglobals{buildroot}$pkgfile") {
+            foreach my $globfile (glob("$specglobals{buildroot}$pkgfile/*")) {
+              gzip $globfile if $globfile !~ m|\.gz$|;
+            }
+          } else {
+            if ($pkgfile !~ m|\.gz$|) {
+              qx { gzip $specglobals{buildroot}$pkgfile };
+              $pkgfile .= ".gz";
+            }
           }
         } else {
@@ -1636 +1648 @@
     $macrostring =~ s'%{_sbindir}'/usr/sbin'g;
     $macrostring =~ s'%{_mandir}'%{_datadir}/man'g;
+    $macrostring =~ s'%{_infodir}'%{_datadir}/info'g;
     $macrostring =~ s'%{_includedir}'/usr/include'g;
     $macrostring =~ s'%{_libdir}'/usr/lib'g;