Changeset 162 for trunk

Timestamp:

04/08/12 21:18:25 (13 years ago)

Author:

kdeugau

Message:

/trunk

Tweak and fiddle %{debdist} generation, since a few new Debian releases
have happened

Location:

trunk

Files:

• debbuild (modified) (3 diffs)
• debbuild.spec (modified) (1 diff)
• template.spec (modified) (1 diff)

trunk/debbuild

@@ -132 +132 @@
         "4"     => "etch",
         "5"     => "lenny",
-        "5.0.0" => "squeeze",
+        "6.0"   => "squeeze",
+        "7.0"   => "wheezy",    #maybe?
         "99"    => "sid");
 # Enh.  There doesn't seem to be any better way to do this...  :(
@@ -146 +147 @@
   } else {
 
+# *eyeroll*  there *really* has to be a better way to go about this.  You
+# can't sanely build packages for multiple distro targets if you can't
+# programmatically figure out which one you're building on.
+
+# note that we care only about major release numbers; tracking minor or point
+# releases would be...  exponentially more painful.
+
     # for the lazy copy-paster:  dpkg-query --showformat '${version}\n' -W base-files
     # avoid shellisms
@@ -152 +160 @@
       close BASEGETTER;
 
-      if ($basever =~ /^\d\.\d\.\d$/) {
-        # sarge, possibly squeeze O_o  (5.0.0 as of 2010/02/03)
-        $basever =~ s/\.\d$//;
-      }
-      $basever = 5 if ($basever =~ /lenny/);
+      ($basever) = ($basever =~ /^(\d(?:\.\d)?)/);
     }
 

trunk/debbuild.spec

@@ -22 +22 @@
 %if "%{debdist}" == "lenny"
 %define errata 3
+%endif
+if "%{debdist}" == "squeeze"
+%define errata 4
+%endif
+if "%{debdist}" == "wheezy"
+%define errata 5
 %endif
 %if %{?relnum:0}%{?!relnum:1}

trunk/template.spec

@@ -22 +22 @@
 %if "%{debdist}" == "lenny"
 %define errata 3
+%endif
+%if "%{debdist}" == "squeeze"
+%define errata 4
+%endif
+%if "%{debdist}" == "wheezy"
+%define errata 5
 %endif
 %if %{?relnum:0}%{?!relnum:1}