rpms/gallery2/EL-5 gallery2-2.3-captcha.patch, NONE, 1.1 gallery2-2.3-installer.patch, NONE, 1.1 gallery2-2.3-module-cleanup.README, NONE, 1.1 gallery2-2.3-smtp.patch, NONE, 1.1 gallery2-2.3-upgrade.patch, NONE, 1.1 README.fedora.Gallery2, 1.5, 1.6 gallery2-httpd-conf, 1.1, 1.2 gallery2.spec, 1.13, 1.14 sources, 1.6, 1.7

Thu Aug 13 14:00:32 UTC 2009

Author: limb

Update of /cvs/pkgs/rpms/gallery2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6666

Modified Files:
	README.fedora.Gallery2 gallery2-httpd-conf gallery2.spec 
	sources 
Added Files:
	gallery2-2.3-captcha.patch gallery2-2.3-installer.patch 
	gallery2-2.3-module-cleanup.README gallery2-2.3-smtp.patch 
	gallery2-2.3-upgrade.patch 
Log Message:
Update to current, 486068


gallery2-2.3-captcha.patch:
 GallerySession.class |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gallery2-2.3-captcha.patch ---
--- modules/core/classes/GallerySession.class~	2009-05-21 09:03:54.000000000 -0500
+++ modules/core/classes/GallerySession.class	2009-05-21 09:03:54.000000000 -0500
@@ -27,0 +28,3 @@
+//BZ 501871, captcha fix.
+GalleryCoreApi::requireOnce('modules/core/classes/GalleryTranslator.class');  
+

gallery2-2.3-installer.patch:
 index.php |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gallery2-2.3-installer.patch ---
--- install/index.php~	2009-06-19 11:58:00.000000000 -0500
+++ install/index.php	2009-06-19 11:58:00.000000000 -0500
@@ -49,0 +50 @@
+require_once($g2Base . 'modules/core/classes/GalleryCoreApi.class');


--- NEW FILE gallery2-2.3-module-cleanup.README ---
A recent update of gallery2 removed 3 modules, which, if these had not been
 deactivated within gallery2 beforehand, caused errors in upgraded gallery2
installations.

To remove the remnants of the recently removed uploadapplet, 
slideshowapplet and remote modules, do the following:

In your gallery2 database:
delete from g2_PluginMap where g_pluginId = 'uploadapplet';
delete from g2_PluginPackageMap where g_pluginId = 'uploadapplet';
delete from g2_PluginParameterMap where g_pluginId = 'uploadapplet';
delete from g2_PluginMap where g_pluginId = 'slideshowapplet';
delete from g2_PluginPackageMap where g_pluginId = 'slideshowapplet';
delete from g2_PluginParameterMap where g_pluginId = 'slideshowapplet';
delete from g2_PluginMap where g_pluginId = 'remote';
delete from g2_PluginPackageMap where g_pluginId = 'remote';
delete from g2_PluginParameterMap where g_pluginId = 'remote';

Then, on the host with gallery2 installed, in your g2data directory:
rm -f g2data/cache/module/_all/0/0/*
rm -rf g2data/cache/module/uploadapplet
rm -rf g2data/cache/module/slideshowapplet
rm -rf g2data/cache/module/remote

This will restore any functionality not directly affected by the .jar 
removals, such as adding new items.
gallery2-2.3-smtp.patch:
 smtp.php |   40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

--- NEW FILE gallery2-2.3-smtp.patch ---
--- lib/smtp/smtp.php~	2008-10-18 02:15:42.000000000 -0500
+++ lib/smtp/smtp.php	2009-05-21 07:14:59.000000000 -0500
@@ -42,14 +42,15 @@
-    if (isset($headers)) {
-	$headers = rtrim($headers);
-
-	// Make sure there are no bare linefeeds in the headers
-	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
-
-	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $cc = split(', *', $match[1]);
-	}
-	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $bcc = split(', *', $match[1]);
-	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
-	}
-    }
+    /// JOEL
+//    if (isset($headers)) {
+//	$headers = rtrim($headers);
+//
+//	// Make sure there are no bare linefeeds in the headers
+//	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
+//
+//	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $cc = split(', *', $match[1]);
+//	}
+//	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $bcc = split(', *', $match[1]);
+//	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
+//	}
+//    }
@@ -68 +69,10 @@
-    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+//    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+// JDY JOEL YOUNG FIX FROM http://blog.bonetree.net/2008/10/configuring-gallery2-to-send-email-using-gmail/
+    $url_info = parse_url($config['smtp.host']);
+    $config['smtp.host'] = '';
+    if( isset($url_info['scheme']) ) {
+       $config['smtp.host'] = $url_info['scheme'].'://';
+       }
+    $config['smtp.host'] .= $url_info['host'];
+    $port = ( isset($url_info['port']) ) ? $url_info['port'] : 25;
+

gallery2-2.3-upgrade.patch:
 index.php |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gallery2-2.3-upgrade.patch ---
--- upgrade/index.php~	2008-10-18 02:15:43.000000000 -0500
+++ upgrade/index.php	2009-07-17 07:46:11.000000000 -0500
@@ -49,0 +50 @@
+require_once($g2Base . 'modules/core/classes/GalleryCoreApi.class');


Index: README.fedora.Gallery2
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/README.fedora.Gallery2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- README.fedora.Gallery2	15 May 2007 19:59:41 -0000	1.5
+++ README.fedora.Gallery2	13 Aug 2009 14:00:30 -0000	1.6
@@ -53,7 +53,9 @@ disregard this notice and refer to the n
 Step 4 (Storage setup): The default selection for the image storage directory
 in this package is /srv/gallery2.  You must chose a directory that the web
 server can write to - if you have a read-only /usr directory tree, the
-storage directory must be outside that tree.
+storage directory must be outside that tree.  If you use the default seletion, 
+you must create this directory yourself and ensure that it is writable by the
+user that your web server runs as (usually 'apache').
 
 Step 7 (Create config file): This step will tell you that the config file,
 config.php, has been written to the gallery2 directory.  It was actually


Index: gallery2-httpd-conf
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/gallery2-httpd-conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gallery2-httpd-conf	7 Jun 2006 03:51:38 -0000	1.1
+++ gallery2-httpd-conf	13 Aug 2009 14:00:30 -0000	1.2
@@ -1,5 +1,5 @@
 Alias /gallery2 /usr/share/gallery2
 
 <Directory /usr/share/gallery2>
-  AllowOverride Options
+  AllowOverride Options FileInfo
 </Directory>


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/gallery2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gallery2.spec	20 Mar 2008 18:11:12 -0000	1.13
+++ gallery2.spec	13 Aug 2009 14:00:30 -0000	1.14
@@ -5,23 +5,37 @@
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.2.4
+Version: 2.3
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
-# Source0: http://dl.sf.net/gallery/gallery-%{version}-developer.tar.gz
-# Tarball from upstream will not work - must use SVN snapshot
-Source0: gallery-2.2.svn.tar.gz
+#Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
+# Tarball from upstream contains prebuilt jars, some of which are not redistributable.
+# Generated from gallery-2.3-full.zip
+# 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
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
+Source4: gallery2-2.3-module-cleanup.README
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty
+Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
 # Subversion needed to generate manifest
-BuildRequires: perl-String-CRC32, subversion
-
-Patch0: gallery2-perl-location.patch
+#BuildRequires: perl-String-CRC32, subversion
+BuildRequires: java-1.6.0-openjdk-devel
+Obsoletes: gallery2-panorama <= 2.3-4
+Obsoletes: gallery2-remote <= 2.3-7
+Obsoletes: gallery2-uploadapplet <= 2.3-7
+Obsoletes: gallery2-slideshowapplet <= 2.3-7
+
+#Patch0: gallery2-perl-location.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
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -123,6 +137,7 @@ Requires: gallery2 = %{version}-%{releas
 Summary: Httpauth module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
+Requires: gallery2-rewrite = %{version}-%{release}
 
 %package icons
 Summary: Icons module for Gallery 2
@@ -145,6 +160,11 @@ Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}, ImageMagick >= 4.0
 Provides: gallery2-graphics
 
+%package jpegtran
+Summary: JPEG manipulation module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}, libjpeg
+
 %package itemadd
 Summary: Itemadd module for Gallery 2
 Group: Applications/Publishing
@@ -206,8 +226,8 @@ Summary: Nokiaupload module for Gallery 
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package panorama
-Summary: Panorama module for Gallery 2
+%package notification
+Summary: Notification module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
@@ -261,10 +281,10 @@ Summary: Register module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package remote
-Summary: Remote module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package remote
+#Summary: Remote module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package replica
 Summary: Replica module for Gallery 2
@@ -311,16 +331,21 @@ Summary: Slideshow module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package slideshowapplet
-Summary: Slideshowapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package slideshowapplet
+#Summary: Slideshowapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package squarethumb
 Summary: Squarethumb module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package snapgalaxy
+Summary: Snapgalaxy module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package thumbnail
 Summary: Thumbnail module for Gallery 2
 Group: Applications/Publishing
@@ -331,10 +356,10 @@ Summary: Thumbpage module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package uploadapplet
-Summary: Uploadapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package uploadapplet
+#Summary: Uploadapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package useralbum
 Summary: Useralbum module for Gallery 2
@@ -495,6 +520,9 @@ Gallery 2 module - Render frames around 
 %description imagemagick
 Gallery 2 module - ImageMagick / GraphicsMagick Graphics Toolkit
 
+%description jpegtran
+Gallery 2 module - JPEG manipulation
+
 %description itemadd
 Gallery 2 module - Item addition
 
@@ -531,8 +559,8 @@ Gallery 2 module - Highlight new/updated
 %description nokiaupload
 Gallery 2 module - Implementation of Nokia Image Upload Server API v1.1 
 
-%description panorama
-Gallery 2 module - View wide jpeg/gif images in a java applet viewer 
+%description notification
+Gallery 2 module - Email notification
 
 %description password
 Gallery 2 module - password - CVS only
@@ -564,8 +592,8 @@ Gallery 2 module - Rearrange the order o
 %description register
 Gallery 2 module - New User Registration
 
-%description remote
-Gallery 2 module - Implementation for the remote control protocol
+#%description remote
+#Gallery 2 module - Implementation for the remote control protocol
 
 %description replica
 Gallery 2 module - Replication support
@@ -594,8 +622,11 @@ Gallery 2 module - Define picture size l
 %description slideshow
 Gallery 2 module - Slideshow 
 
-%description slideshowapplet
-Gallery 2 module - Fullscreen slideshow using a Java applet
+#%description slideshowapplet
+#Gallery 2 module - Fullscreen slideshow using a Java applet
+
+%description snapgalaxy
+Gallery 2 module - Print photos using SnapGalaxy
 
 %description squarethumb
 Gallery 2 module - Build all thumbnails so they are square
@@ -607,8 +638,8 @@ Gallery 2 module - Set default thumbnail
 Gallery 2 module - Select page/frame from a multipage file or movie 
 for the thumbnail
 
-%description uploadapplet
-Gallery 2 module - Easy to use upload applet for media
+#%description uploadapplet
+#Gallery 2 module - Easy to use upload applet for media
 
 %description useralbum
 Gallery 2 module - Create an album for each new user
@@ -655,12 +686,16 @@ subalbums/other items not shown
 
 %prep
 %setup -q -n gallery2
-%patch0 -p1
+#%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
 
 %build
-pushd lib/tools/bin
-perl makeManifest.pl
-popd
+#pushd lib/tools/bin
+#perl makeManifest.pl
+#popd
 rm -rf `cat MANIFEST | grep -e "^R" | cut -f 2`
 find . -depth -name .svn -type d -exec rm -rf {} \;
 # Remove the execute bit from files that don't start with #!
@@ -671,20 +706,27 @@ for file in `find -type f -perm /111`; d
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
+#These modules need unredistributable jars, so we'll remove the files.
+rm -rf modules/panorama
+rm -rf modules/remote
+rm -rf modules/uploadapplet
+rm -rf modules/slideshowapplet
+
 
 %install
+rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{installprefix}/gallery2
 install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/gallery2.conf
 install -m 0644 -p %{SOURCE2} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/.htaccess
+#remove bundled Smarty.
+rm -rf lib/smarty
 cp -pr * ${RPM_BUILD_ROOT}%{installprefix}/gallery2
-# Remove lib/Smarty directory to try to use php-Smary package
-rm -rf ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/Smarty
 install -m 0644 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/README.fedora
+install -m 0644 -p %{SOURCE4} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/gallery2-2.3-module-cleanup.README
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/premerge-messages.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/update-all-translations.pl
-chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/bin/getIllegalFunctions.pl
-chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/uml/make-java-classes.pl
-mkdir -p ${RPM_BUILD_ROOT}%{g2datadir}
+#chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/bin/getIllegalFunctions.pl
+#chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/uml/make-java-classes.pl
 mkdir -p ${RPM_BUILD_ROOT}%{g2confdir}
 # Touch a login.txt in /srv/gallery2/ and ghost it so we don't
 # run afoul of a ro /usr
@@ -695,6 +737,7 @@ echo "\$gallery->setConfig('data.gallery
 echo "?>" >> ${RPM_BUILD_ROOT}%{g2confdir}/config.php
 ln -s ../../..%{g2confdir}/config.php ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
 chmod 644 ${RPM_BUILD_ROOT}%{g2confdir}/config.php
+ln -s ../../php/Smarty ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/smarty
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -716,6 +759,18 @@ echo If this is an upgrade from a previo
 echo please be sure to point a web browser at http://\<hostname\>/gallery2/upgrade/
 echo and follow the instructions there to complete the upgrade process.
 
+if [ -d %{installprefix}/gallery2/lib/smarty -a ! -L %{installprefix}/gallery2/lib/smarty ]; then
+    mv %{installprefix}/gallery2/lib/smarty %{installprefix}/gallery2/lib/smarty.rpmbak && \
+    ln -s ../../php/Smarty %{installprefix}/gallery2/lib/smarty && \
+    rm -rf %{installprefix}/gallery2/lib/smarty.rpmbak
+fi 
+if [ ! -L %{installprefix}/gallery2/lib/smarty ]; then
+  ln -s ../../php/Smarty %{installprefix}/gallery2/lib/smarty
+fi
+
+
+
+
 %files
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/bootstrap.inc
@@ -732,17 +787,19 @@ echo and follow the instructions there t
 %dir %{installprefix}/gallery2/modules
 %{installprefix}/gallery2/modules/core/
 %dir %{installprefix}/gallery2/themes
-%attr(-,apache,root) %dir %{g2datadir}
+%{installprefix}/gallery2/locale/
 %{installprefix}/gallery2/upgrade/
 %doc %{installprefix}/gallery2/LICENSE
 %doc %{installprefix}/gallery2/MANIFEST
 %doc %{installprefix}/gallery2/README.html
 %doc %{installprefix}/gallery2/README.fedora
+%doc %{installprefix}/gallery2/gallery2-2.3-module-cleanup.README
 %attr(-,apache,root) %config(noreplace) %{g2confdir}/config.php
 %config(noreplace) %{installprefix}/gallery2/.htaccess
 %dir %{g2confdir}
 %config(noreplace) %{g2confdir}/login.txt
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/gallery2.conf
+%ghost %{installprefix}/gallery2/lib/smarty
 
 %files albumselect
 %defattr(-,root,root,-)
@@ -840,6 +897,10 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/imagemagick/
 
+%files jpegtran
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/jpegtran/
+
 %files linkitem
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/linkitem/
@@ -888,9 +949,9 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/nokiaupload/
 
-%files panorama
+%files notification
 %defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/panorama/
+%{installprefix}/gallery2/modules/notification/
 
 %files password
 %defattr(-,root,root,-)
@@ -932,9 +993,9 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/register/
 
-%files remote
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/remote/
+#%files remote
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/remote/
 
 %files replica
 %defattr(-,root,root,-)
@@ -972,9 +1033,13 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshow/
 
-%files slideshowapplet
+#%files slideshowapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/slideshowapplet/
+
+%files snapgalaxy
 %defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/slideshowapplet/
+%{installprefix}/gallery2/modules/snapgalaxy/
 
 %files squarethumb
 %defattr(-,root,root,-)
@@ -988,9 +1053,9 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/thumbpage/
 
-%files uploadapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/uploadapplet/
+#%files uploadapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/uploadapplet/
 
 %files useralbum
 %defattr(-,root,root,-)
@@ -1049,6 +1114,69 @@ echo and follow the instructions there t
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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
+
+* Fri Jul 17 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-14
+- Upgrader patch, BZ 506983.
+- Removed extra slash from installer patch.
+
+* Fri Jun 19 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-13
+- Installer patch, BZ 506983.
+
+* Wed May 27 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-12
+- Added gallery2-2.3-module-cleanup.README.
+
+* Wed May 21 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-11
+- Patch to fix SMTP, 501868.
+- Patch to fix captcha, 501871.
+
+* Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-10
+- Fine-tuning of symlink script.
+
+* Fri May 01 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-9
+- Add rewrite dep for httpauth, BZ 498061.
+- Adopt rdieter's symlink handling suggestions from rel-eng #1674.
+
+* Tue Apr 28 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-8
+- pretrans script logic fix. BZ498019.
+
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
+- Drop all jars and remote, uploadapplet and slideshowapplet modules
+- to satisfy legal requirements, as source build would be
+- highly laborious and functionality is not critical.
+- See BZ464566 for details.
+
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-6
+- Document jar source origins, build jars in build, not prep.
+
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-5
+- Remove .jar files and build from source BZ464566.
+- Modify source to remove two non-redistutable .jar files.
+- Dropped panorama module as a result.
+- Fix symlink/dir issues, BZ 484240.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-3
+- Base requires gallery2-httpauth for upgrade path, BZ 483523.
+
+* Thu Dec 18 2008 Jon Ciesla <limb at jcomserv.net> - 2.3-2
+- Correct removal of bundled Smarty and usage of system Smarty.
+
+* Thu Dec 04 2008 Jon Ciesla <limb at jcomserv.net> - 2.3-1
+- Update to new upstream.
+- Rebased on tarball now that perl path issue is fixed.
+- Added buildroot wipe to start of install.
+- Escaped macros in changelog.
+
+* Wed Jun 18 2008 John Berninger <john at ncphotography dot com> - 2.2.5-1
+- update to upstream 2.2.5 for security vuln fixes
+
+* Tue Apr 22 2008 John Berninger <john at ncphotography dot com> - 2.2.4-4
+- don't create or own any dirs in /srv
+
 * Thu Mar 20 2008 John Berninger <john at ncphotography dot com> - 2.2.4-3
 - revert to SVN snapshot so that config-time integrity checks don't fail
 - remove embedded copy of smarty and use php-Smarty package
@@ -1122,7 +1250,7 @@ echo and follow the instructions there t
 - Removed find_lang stuff since it only looks in /usr/share
 
 * Thu May 25 2006 John Berninger <johnw at berningeronline dot net> - 2.1-0.16.svn20060524
-- Trying to use %find_lang but builds fail.  Uploading for review / assistance
+- Trying to use %%find_lang but builds fail.  Uploading for review / assistance
 - Switch name to svn (vs cvs)
 - Various corrections
 
@@ -1148,18 +1276,18 @@ echo and follow the instructions there t
 - Add an alias for the gallery2.conf file that goes into httpd/conf.d
 
 * Sun Feb 26 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-0.9cvs20060223
-- Remove %post, requesting modifications to selinux-policy to handle security
+- Remove %%post, requesting modifications to selinux-policy to handle security
   contexts - BZ 183140
 
 * Fri Feb 24 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-0.8cvs20060223
-- Add a %post to check for the existence of /usr/bin/chcon, which signifies the
+- Add a %%post to check for the existence of /usr/bin/chcon, which signifies the
   presence of SELinux, and if it is found, change the security context of
   /srv/gallery2 appropriately.
 
 * Thu Feb 23 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-0.7cvs20060223
 - Change to CVS tarball.
 - gallery2-gd requires php-gd
-- Added %build section to regen the MANIFEST file.
+- Added %%build section to regen the MANIFEST file.
 - Added several CVS-only modules
 - Added /etc/httpd/conf.d/gallery2.conf config file
 - Added php memory limit override directive to .htaccess
@@ -1180,7 +1308,7 @@ echo and follow the instructions there t
 
 * Sun Feb 19 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-4
 - Split off documentation into a -docs package, modify payload listing,
-  remove "listed twice" error, change %ghost %config into pure %ghost.
+  remove "listed twice" error, change %%ghost %%config into pure %%ghost.
 - Release bump to -4
 
 * Sun Feb 19 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-3
@@ -1190,7 +1318,7 @@ echo and follow the instructions there t
 - Added ghost config files - these are created during initial setup, they are
   not part of the tarball's payload.
 - Removed relocatability
-- Added '-q' to %setup line
+- Added '-q' to %%setup line
 - Changed name to 'gallery2' (versus 'gallery')
 
 * Tue Feb 14 2006 John Berninger <johnw at berningeronline dot net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Mar 2008 18:18:43 -0000	1.6
+++ sources	13 Aug 2009 14:00:30 -0000	1.7
@@ -1 +1 @@
-7f10a8605f2b69a49929f757fc2b4a92  gallery-2.2.svn.tar.gz
+f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz


