rpms/gallery2/F-10 gallery2.spec,1.19,1.20 sources,1.9,1.10

[Jon Ciesla]

Author: limb

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

Modified Files:
	gallery2.spec sources 
Log Message:
Multiple packaging fixes.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gallery2.spec	4 Feb 2009 20:46:01 -0000	1.19
+++ gallery2.spec	13 Apr 2009 17:45:34 -0000	1.20
@@ -7,20 +7,26 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
-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: 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: 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
 BuildArch: noarch
 # Subversion needed to generate manifest
 #BuildRequires: perl-String-CRC32, subversion
-
+BuildRequires: java-1.6.0-openjdk-devel
+Obsoletes: gallery2-panorama <= 2.3-4
 #Patch0: gallery2-perl-location.patch
 
 %package albumselect
@@ -216,12 +222,6 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-
-%package panorama
-Summary: Panorama module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
-
 %package password
 Summary: Password module for Gallery 2
 Group: Applications/Publishing
@@ -553,9 +553,6 @@
 %description notification
 Gallery 2 module - Email notification
 
-%description panorama
-Gallery 2 module - View wide jpeg/gif images in a java applet viewer 
-
 %description password
 Gallery 2 module - password - CVS only
 
@@ -681,6 +678,10 @@
 %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
@@ -696,6 +697,13 @@
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
+#Panorama needs an unredistributable jar, so we'll remove the files.
+rm -rf modules/panorama
+#install built jars
+install -m 0644 gallery-jar-sources-2.3/jars/remote/* modules/remote/applets
+install -m 0644 gallery-jar-sources-2.3/jars/slideshowapplet/* modules/slideshowapplet/applets
+install -m 0644 gallery-jar-sources-2.3/jars/uploadapplet/* modules/uploadapplet/applets
+rm -rf gallery-jar-sources-2.3
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -705,8 +713,6 @@
 #remove bundled Smarty.
 rm -rf lib/smarty
 cp -pr * ${RPM_BUILD_ROOT}%{installprefix}/gallery2
-#use system Smarty
-ln -s ../../php/Smarty ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/smarty
 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
@@ -723,9 +729,17 @@
 ln -s ../../..%{g2confdir}/config.php ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
 chmod 644 ${RPM_BUILD_ROOT}%{g2confdir}/config.php
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%pretrans
+#symlink to system smarty
+if [ -d /usr/share/gallery2/lib/smarty ]; then
+  rm -rf /usr/share/gallery2/lib/smarty
+  ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
+fi
+
 %post
 if [[ -f %{installprefix}/gallery2/config.php.rpmnew ]]
 then
@@ -923,10 +937,6 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/notification/
 
-%files panorama
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/panorama/
-
 %files password
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/password/
@@ -1088,6 +1098,15 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Dec 2008 20:49:56 -0000	1.9
+++ sources	13 Apr 2009 17:45:34 -0000	1.10
@@ -1 +1,2 @@
-59aa83d15989fdd05c623ef3563b800f  gallery-2.3-full.zip
+f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
+01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz