- 11.4.0.8

Changed files:
    anaconda-branding.patch -> 1.5
    anaconda-kernel.patch -> 1.7
    anaconda-libdir.patch -> 1.6
    anaconda-pld-release.patch -> 1.4
    anaconda-timezone.patch -> 1.5
    anaconda.spec -> 1.66

diff --git a/anaconda-branding.patch b/anaconda-branding.patch
index caa82cbc74c6047c14ba36654711edaecd2f5056..3e644977369d132e850bf15139fba465b7ada0ce 100644 (file)
--- a/anaconda-branding.patch
+++ b/anaconda-branding.patch
@@ -1,18 +1,18 @@
 --- anaconda-11.2.0.24.org/product.py  2006-05-08 22:22:44.000000000 +0200
 +++ anaconda-11.2.0.24/product.py      2007-02-20 19:14:33.134623000 +0100
-@@ -23,10 +23,11 @@
+@@ -23,11 +23,11 @@
      path = None
      
  productStamp = ""
 -productName = "anaconda"
 -productVersion = "bluesky"
 -productPath = "anaconda"
--bugUrl = "your distribution provided bug reporting tool."
 +productName = "PLD Linux Distribution"
 +productVersion = "3.0 (Th)"
 +productPath = "PLD"
+ productArch = None
+-bugUrl = "your distribution provided bug reporting tool."
 +bugUrl = "http://bugs.pld-linux.org/"
-+
  
  if path is not None:
      f = open(path, "r")

diff --git a/anaconda-kernel.patch b/anaconda-kernel.patch
index 22be6168ad15eead58ee49a3cfdd2a4dadf11e2a..6acfd188af0b0562d5b185ba1ed9baa80a96ad87 100644 (file)
--- a/anaconda-kernel.patch
+++ b/anaconda-kernel.patch
@@ -1,11 +1,10 @@
 --- anaconda-11.2.0.24.org/yuminstall.py       2007-02-13 14:56:08.000000000 +0100
 +++ anaconda-11.2.0.24/yuminstall.py   2007-02-20 19:12:05.894623000 +0100
-@@ -1009,7 +1009,7 @@
- 
+@@ -1009,6 +1009,7 @@
          # FIXME: this is a bit of a hack.  we shouldn't hard-code and
          # instead check by provides.  but alas.
--        for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen"):
-+        for k in ("kernel", "kernel-smp", "kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0", "kernel-xen"):
-             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:            
-                 foundkernel = True
- 
+         for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen",
++                  "kernel-grsecurity", "kernel-grsecurity-smp",
+                   "kernel-PAE"):
+             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
+                 self.selectModulePackages(anaconda, k)

diff --git a/anaconda-libdir.patch b/anaconda-libdir.patch
index bd9667b226fb06712e8879bbba09fd856a9f1403..5463a3df8e299ea840b5b899d0b08c5943b67a25 100644 (file)
--- a/anaconda-libdir.patch
+++ b/anaconda-libdir.patch
@@ -110,18 +110,6 @@ diff -ur anaconda-11.2.0.24/command-stubs/mknod-stub anaconda-11.2.0.24/command-
  import isys
  import string
  import stat
-diff -ur anaconda-11.2.0.24/command-stubs/pump-stub anaconda-11.2.0.24/command-stubs/pump-stub
---- anaconda-11.2.0.24/command-stubs/pump-stub 2004-01-23 05:01:21.000000000 +0100
-+++ anaconda-11.2.0.24/command-stubs/pump-stub 2007-02-20 18:19:06.622623000 +0100
-@@ -7,7 +7,7 @@
- if (os.path.exists('isys')):
-     sys.path.append('isys')
- 
--sys.path.append('/usr/lib/anaconda')
-+sys.path.append('/usr/%s/anaconda' % sys.lib)
- 
- import isys
- from sys import argv
 diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub
 --- anaconda-11.2.0.24/command-stubs/raidstart-stub    2006-03-28 18:49:14.000000000 +0200
 +++ anaconda-11.2.0.24/command-stubs/raidstart-stub    2007-02-20 18:19:36.002623000 +0100

diff --git a/anaconda-pld-release.patch b/anaconda-pld-release.patch
index d129c56b0f383aff54f2df6f87d8ee62b49abbce..5ed9aff789f172f86cef4b93fb79a19ba3c51ac5 100644 (file)
--- a/anaconda-pld-release.patch
+++ b/anaconda-pld-release.patch
@@ -1,15 +1,3 @@
-diff -ur anaconda-11.2.0.24.org/docs/command-line.txt anaconda-11.2.0.24/docs/command-line.txt
---- anaconda-11.2.0.24.org/docs/command-line.txt       2006-12-04 23:05:25.000000000 +0100
-+++ anaconda-11.2.0.24/docs/command-line.txt   2007-02-20 18:24:43.130623000 +0100
-@@ -144,7 +144,7 @@
- 
- updates=http://<path> Image containing updates over HTTP.
- 
--upgradeany    Don't require an /etc/redhat-release that matches the 
-+upgradeany    Don't require an /etc/pld-release that matches the 
-               expected syntax to upgrade.
- 
- vnc             Enable vnc-based installation. You will need to connect
 diff -ur anaconda-11.2.0.24.org/partedUtils.py anaconda-11.2.0.24/partedUtils.py
 --- anaconda-11.2.0.24.org/partedUtils.py      2007-01-16 20:58:13.000000000 +0100
 +++ anaconda-11.2.0.24/partedUtils.py  2007-02-20 18:33:58.522623000 +0100
@@ -96,15 +84,6 @@ diff -ur anaconda-11.2.0.24.org/scripts/yumcache anaconda-11.2.0.24/scripts/yumc
 diff -ur anaconda-11.2.0.24.org/yuminstall.py anaconda-11.2.0.24/yuminstall.py
 --- anaconda-11.2.0.24.org/yuminstall.py       2007-02-13 14:56:08.000000000 +0100
 +++ anaconda-11.2.0.24/yuminstall.py   2007-02-20 18:26:50.814623000 +0100
-@@ -495,7 +495,7 @@
-         self.conf.reposdir="/tmp/repos.d"
-         self.conf.logfile="/tmp/yum.log"
-         self.conf.obsoletes=True
--        self.conf.exclude=["*debuginfo*"]
-+        self.conf.exclude=["*debuginfo*", "vserver-packages"]
-         self.conf.cache=0
-         self.conf.cachedir = '/tmp/cache/'
-         self.conf.metadata_expire = 0
 @@ -1269,7 +1269,7 @@
          # Figure out current version for upgrade nag and for determining weird
          # upgrade cases
@@ -114,3 +93,14 @@ diff -ur anaconda-11.2.0.24.org/yuminstall.py anaconda-11.2.0.24/yuminstall.py
              n, a, e, v, r = pkgtup
              if supportedUpgradeVersion <= 0:
                  val = rpmUtils.miscutils.compareEVR((None, '3', '1'),
+--- anaconda-11.4.0.8/docs/command-line.txt~   2007-12-13 22:09:32.000000000 +0100
++++ anaconda-11.4.0.8/docs/command-line.txt    2007-12-13 22:10:12.367665081 +0100
+@@ -319,7 +319,7 @@
+ 
+    upgradeany
+ 
+-     o Don't require an /etc/redhat-release that matches the expected syntax
++     o Don't require an /etc/pld-release that matches the expected syntax
+        to upgrade.
+ 
+    usefbx

diff --git a/anaconda-timezone.patch b/anaconda-timezone.patch
index 8a18a2c2b830fb80627080f66e3e566d5243ef55..7eea428d8eece2bc6cd652d20f51b8869eb49894 100644 (file)
--- a/anaconda-timezone.patch
+++ b/anaconda-timezone.patch
@@ -5,7 +5,7 @@ diff -ur anaconda-11.2.0.24.org/iw/timezone_gui.py anaconda-11.2.0.24/iw/timezon
          gtk.glade.set_custom_handler(self.custom_widget_handler)
  
          # Set the default now.  We'll fix it for real in getScreen.
--        self.default = "America/New_York"
+-        self.default = "America/New York"
 +        self.default = "Europe/Warsaw"
  
          self.zonetab = zonetab.ZoneTab()
@@ -17,22 +17,13 @@ diff -ur anaconda-11.2.0.24.org/iw/timezone_gui.py anaconda-11.2.0.24/iw/timezon
 -            self.default = "America/New_York"
 +            self.default = "Europe/Warsaw"
  
-         # Now fix the default we set when we made the timezone map widget.
-         self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default))
-@@ -126,7 +126,7 @@
-     if tz.lat >= latmin and tz.lat <= latmax and tz.long >= longmin and tz.long <= longmax:
-         return True
-     elif user_data.currentEntry == None:
--        if model.get_value(iter, 1) == "America/New_York":
-+        if model.get_value(iter, 1) == "Europe/Warsaw":
-             return True
-         else:
-             return False
+         self.default = self.default.replace("_", " ")
+ 
 @@ -151,7 +151,7 @@
                                    weight=pango.WEIGHT_BOLD)
                  self.markers[entry.tz] = marker
  
--                if entry.tz == "America/New_York":
+-                if entry.tz == "America/New York":
 +                if entry.tz == "Europe/Warsaw":
                      # In case the /etc/sysconfig/clock is messed up, use New
                      # York as the default.

diff --git a/anaconda.spec b/anaconda.spec
index 48e2cc0e9aa169ab15c27647eb04be9a89494fe3..5c1dc3d1d8874c5710af594afbd1087bebd7434d 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -41,12 +41,12 @@
 Summary:       Graphical system installer
 Summary(pl.UTF-8):     Graficzny instalator systemu
 Name:          anaconda
-Version:       11.2.0.24
+Version:       11.4.0.8
 Release:       0.1
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 2e6fb1206a209af5f13181670c882819
+# Source0-md5: fc38608dae09406ba89c85ed83bd5f43
 Source1:       %{name}-mk-images
 Source2:       %{name}-upd-instroot
 Source3:       %{name}-mk-images.i386
@@ -55,7 +55,7 @@ Source5:      %{name}-installclass-pld.py
 Source6:       %{name}-splash.png
 # Source6-md5: 6b38a868585adfd3a96a4ad16973c1f8
 Patch0:                %{name}-pld.patch
-Patch1:                %{name}-BUS_XEN.patch
+#Patch1:               %{name}-BUS_XEN.patch
 Patch2:                %{name}-vserver-proc.patch
 Patch3:                %{name}-pkgorder.patch
 Patch4:                %{name}-errorhandling.patch
@@ -66,7 +66,7 @@ Patch8:               %{name}-kernel.patch
 Patch9:                %{name}-optflags.patch
 Patch10:       %{name}-network.patch
 Patch11:       %{name}-branding.patch
-Patch12:       %{name}-x11.patch
+#Patch12:      %{name}-x11.patch
 Patch13:       %{name}-installclasses.patch
 Patch14:       %{name}-release_notes_viewer_gui.patch
 Patch15:       %{name}-hosttree.patch
@@ -200,7 +200,7 @@ Kod źródłowy Anacondy do celów diagnostycznych.
 %setup -q
 # looks obsolete
 #%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 #%patch2 -p1
 %patch3 -p1
 # obsolete, all parts merged
@@ -214,7 +214,7 @@ Kod źródłowy Anacondy do celów diagnostycznych.
 # obsolete, already merged
 # %patch10 -p1
 %patch11 -p1
-%patch12 -p1
+#%patch12 -p1
 #?
 #%patch13 -p1
 #?