- up to 2.2

Changed files:
    gallery-setup.patch -> 1.3
    gallery.spec -> 1.54

diff --git a/gallery-setup.patch b/gallery-setup.patch
index ec97c875c9661e3bb9a62bde797e0a2f7f874e4f..5526c21416ed6d017a7b16176d9b39dd30cd7fb0 100644 (file)
--- a/gallery-setup.patch
+++ b/gallery-setup.patch
@@ -1,20 +1,17 @@
---- gallery2/install/steps/DatabaseSetupStep.class     2006-07-27 11:34:42.000000000 +0300
-+++ /home/glen/DatabaseSetupStep.class 2006-08-27 16:22:10.733076039 +0300
-@@ -31,9 +33,9 @@
-           $this->_config = $galleryStub->getConfig('storage.config');
-           if (empty($this->_config)) {
+--- install/steps/DatabaseSetupStep.class.orig 2007-03-17 18:35:42.000000000 +0100
++++ install/steps/DatabaseSetupStep.class      2007-03-17 18:38:53.000000000 +0100
+@@ -37,7 +37,7 @@
                $this->_config = array();
--              $this->_config['type'] = 'mysqlt';
-+              $this->_config['type'] = 'mysqlt';
+               $this->_config['type'] = 'mysqlt';
                $this->_config['hostname'] = 'localhost';
 -              $this->_config['username'] = 'root';
 +              $this->_config['username'] = 'mysql';
                $this->_config['password'] = '';
                $this->_config['database'] = 'gallery2';
                $this->_config['tablePrefix'] = 'g2_';
---- gallery2/install/steps/StorageSetupStep.class      2006-07-27 11:34:42.000000000 +0300
-+++ /home/glen/StorageSetupStep.class  2006-08-27 16:22:10.753076488 +0300
-@@ -29,7 +31,7 @@
+--- install/steps/StorageSetupStep.class.orig  2007-03-17 18:37:13.000000000 +0100
++++ install/steps/StorageSetupStep.class       2007-03-17 18:39:22.000000000 +0100
+@@ -33,7 +33,7 @@
        if (empty($this->_dir)) {
            $this->_dir = $galleryStub->getConfig('data.gallery.base');
            if (empty($this->_dir)) {
@@ -22,4 +19,4 @@
 +              $this->_dir = '/var/lib/gallery';
            }
        }
- 
+       /*

diff --git a/gallery.spec b/gallery.spec
index 1d9ad3fa6595583d1b0d6ae1c86de9b9a58f2559..080bbe88f706b7c574c7cdeec21ec204a998c00e 100644 (file)
--- a/gallery.spec
+++ b/gallery.spec
@@ -1,18 +1,16 @@
 # TODO:
 # - use external libs, not the included ones: pear, smarty, adodb
 # - move to separate packages each: theme, module.
-%define        _snap   20060728
-%define        _rel    0.8
 Summary:       Web based photo album viewer and creator
 Summary(pl.UTF-8):     Przeglądarka i generator albumów zdjęć w postaci stron WWW
 Name:          gallery
-Version:       2.1.1a
-Release:       1.%{_snap}.%{_rel}
+Version:       2.2
+Release:       1
 License:       GPL
 Group:         Applications/Publishing
-#Source0:      http://dl.sourceforge.net/gallery/%{name}-%{version}-full.tar.gz
-Source0:       http://galleryupdates.jpmullan.com/G2/%{name}-nightly.tar.gz
-# Source0-md5: 6d609d4bbce81c7719799ad953a8b7d1
+Source0:       http://dl.sourceforge.net/gallery/%{name}-%{version}-full.tar.gz
+# Source0-md5: 68742ba80acb25710702ea5e52251dfe
+#Source0:      http://galleryupdates.jpmullan.com/G2/%{name}-nightly.tar.gz
 Source1:       %{name}-apache.conf
 Patch0:                %{name}-setup.patch
 URL:           http://gallery.sourceforge.net/
@@ -66,7 +64,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
 %setup -q -n %{name}2
-%patch0 -p1
+%patch0 -p0
 
 rm -f LICENSE.txt *.bat