rpms/gallery2/devel gallery2.spec,1.22,1.23

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/gallery2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11965

Modified Files:
	gallery2.spec 
Log Message:
Document jar source origins, build jars in build, not prep.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gallery2.spec	13 Apr 2009 16:45:00 -0000	1.22
+++ gallery2.spec	13 Apr 2009 20:13:58 -0000	1.23
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 5%{?dist}
+Release: 6%{?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.
@@ -19,6 +19,8 @@
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
+#The following are the sources of the bundled jars.
+#Generated by extracting the jars using jar -xf.
 Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
@@ -678,15 +680,15 @@
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
-tar -xf %{SOURCE4}
-cd gallery-jar-sources-2.3
-sh build-jars.sh
-cd ..
 
 %build
 #pushd lib/tools/bin
 #perl makeManifest.pl
 #popd
+tar -xf %{SOURCE4}
+cd gallery-jar-sources-2.3
+sh build-jars.sh
+cd ..
 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 #!
@@ -1098,6 +1100,9 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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.