rpms/gallery2/F-10 gallery2.spec,1.17,1.18 sources,1.8,1.9

Wed Dec 10 20:50:26 UTC 2008

Author: limb

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

Modified Files:
	gallery2.spec sources 
Log Message:
New upstream.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18

--- gallery2.spec	18 Jun 2008 15:20:36 -0000	1.17
+++ gallery2.spec	10 Dec 2008 20:49:54 -0000	1.18
@@ -5,13 +5,13 @@
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.2.5
+Version: 2.3
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2+
-# Source0: http://dl.sf.net/gallery/gallery-%{version}-developer.tar.gz
+Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream will not work - must use SVN snapshot
-Source0: gallery2-svn20080618.tar.bz2
+#Source0: gallery2-svn20080618.tar.bz2
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
@@ -19,9 +19,9 @@
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty
 BuildArch: noarch
 # Subversion needed to generate manifest
-BuildRequires: perl-String-CRC32, subversion
+#BuildRequires: perl-String-CRC32, subversion
 
-Patch0: gallery2-perl-location.patch
+#Patch0: gallery2-perl-location.patch
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -145,6 +145,11 @@
 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,6 +211,12 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package notification
+Summary: Notification module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
+
 %package panorama
 Summary: Panorama module for Gallery 2
 Group: Applications/Publishing
@@ -321,6 +332,11 @@
 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
@@ -495,6 +511,9 @@
 %description imagemagick
 Gallery 2 module - ImageMagick / GraphicsMagick Graphics Toolkit
 
+%description jpegtran
+Gallery 2 module - JPEG manipulation
+
 %description itemadd
 Gallery 2 module - Item addition
 
@@ -531,6 +550,9 @@
 %description nokiaupload
 Gallery 2 module - Implementation of Nokia Image Upload Server API v1.1 
 
+%description notification
+Gallery 2 module - Email notification
+
 %description panorama
 Gallery 2 module - View wide jpeg/gif images in a java applet viewer 
 
@@ -597,6 +619,9 @@
 %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
 
@@ -655,12 +680,12 @@
 
 %prep
 %setup -q -n gallery2
-%patch0 -p1
+#%patch0 -p1
 
 %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 #!
@@ -673,6 +698,7 @@
 chmod 755 lib/tools/po/header.pl
 
 %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
@@ -682,8 +708,8 @@
 install -m 0644 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/README.fedora
 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
+#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
@@ -731,6 +757,7 @@
 %dir %{installprefix}/gallery2/modules
 %{installprefix}/gallery2/modules/core/
 %dir %{installprefix}/gallery2/themes
+%{installprefix}/gallery2/locale/
 %{installprefix}/gallery2/upgrade/
 %doc %{installprefix}/gallery2/LICENSE
 %doc %{installprefix}/gallery2/MANIFEST
@@ -838,6 +865,10 @@
 %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/
@@ -886,6 +917,10 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/nokiaupload/
 
+%files notification
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/notification/
+
 %files panorama
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/panorama/
@@ -974,6 +1009,10 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshowapplet/
 
+%files snapgalaxy
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/snapgalaxy/
+
 %files squarethumb
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/squarethumb/
@@ -1047,6 +1086,12 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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
 
@@ -1126,7 +1171,7 @@
 - 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
 
@@ -1152,18 +1197,18 @@
 - 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
@@ -1184,7 +1229,7 @@
 
 * 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
@@ -1194,7 +1239,7 @@
 - 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/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Jun 2008 15:20:36 -0000	1.8
+++ sources	10 Dec 2008 20:49:56 -0000	1.9
@@ -1 +1 @@
-03a15000537e4b5c59b535c97a13d800  gallery2-svn20080618.tar.bz2
+59aa83d15989fdd05c623ef3563b800f  gallery-2.3-full.zip


