rpms/gallery2/F-10 gallery2.spec,1.20,1.21 sources,1.10,1.11

[Jon Ciesla]

Author: limb

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

Modified Files:
	gallery2.spec sources 
Log Message:
Legal fix.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gallery2.spec	13 Apr 2009 17:45:34 -0000	1.20
+++ gallery2.spec	21 Apr 2009 13:08:59 -0000	1.21
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 5%{?dist}
+Release: 7%{?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,7 +19,6 @@
 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
@@ -27,6 +26,10 @@
 #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
 
 %package albumselect
@@ -272,10 +275,10 @@
 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
@@ -322,10 +325,10 @@
 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
@@ -347,10 +350,10 @@
 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
@@ -583,8 +586,8 @@
 %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
@@ -613,8 +616,8 @@
 %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
@@ -629,8 +632,8 @@
 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
@@ -678,10 +681,6 @@
 %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
@@ -697,13 +696,12 @@
 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.
+#These modules need unredistributable jars, 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
+rm -rf modules/remote
+rm -rf modules/uploadapplet
+rm -rf modules/slideshowapplet
+
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -977,9 +975,9 @@
 %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,-)
@@ -1017,9 +1015,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshow/
 
-%files slideshowapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/slideshowapplet/
+#%files slideshowapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/slideshowapplet/
 
 %files snapgalaxy
 %defattr(-,root,root,-)
@@ -1037,9 +1035,9 @@
 %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,-)
@@ -1098,6 +1096,15 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Apr 2009 17:45:34 -0000	1.10
+++ sources	21 Apr 2009 13:08:59 -0000	1.11
@@ -1,2 +1 @@
 f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
-01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz