rpms/gallery2/F-12 gallery2.spec,1.32,1.33 sources,1.11,1.12

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21138

Modified Files:
	gallery2.spec sources 
Log Message:
2.3.1.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-12/gallery2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gallery2.spec	24 Jul 2009 23:27:51 -0000	1.32
+++ gallery2.spec	18 Dec 2009 20:50:03 -0000	1.33
@@ -5,9 +5,9 @@
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.3
+Version: 2.3.1
 Group: Applications/Publishing
-Release: 15%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -15,7 +15,7 @@ License: GPLv2+
 # unzip gallery-2.3-full.zip
 # find . -name '*.jar' | xargs rm -f
 # tar -czf gallery-2.3-jarless.tar.gz gallery2/
-Source0: gallery-2.3-jarless.tar.gz
+Source0: gallery-2.3.1-jarless.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
@@ -32,7 +32,7 @@ Obsoletes: gallery2-uploadapplet <= 2.3-
 Obsoletes: gallery2-slideshowapplet <= 2.3-7
 
 #Patch0: gallery2-perl-location.patch
-Patch1: gallery2-2.3-smtp.patch
+#Patch1: gallery2-2.3-smtp.patch
 Patch2: gallery2-2.3-captcha.patch
 Patch3: gallery2-2.3-installer.patch
 Patch4: gallery2-2.3-upgrade.patch
@@ -687,7 +687,7 @@ subalbums/other items not shown
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
@@ -1114,6 +1114,10 @@ fi
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.1-1
+- 2.3.1, fix for upgrader in PHP 5.3.x.
+- smtp patch upstreamed.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Apr 2009 17:39:16 -0000	1.11
+++ sources	18 Dec 2009 20:50:03 -0000	1.12
@@ -1 +1 @@
-f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
+00c873109c783fcaba428c4320666888  gallery-2.3.1-jarless.tar.gz