rpms/gallery2/F-9 README.fedora.Gallery2, 1.5, 1.6 gallery2.spec, 1.18, 1.19 sources, 1.9, 1.10
Jon Ciesla
limb at fedoraproject.org
Thu Jun 4 13:51:50 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/gallery2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12305
Modified Files:
README.fedora.Gallery2 gallery2.spec sources
Log Message:
Port fixed from F-10+ to F-9.
Index: README.fedora.Gallery2
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-9/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 20:05:21 -0000 1.5
+++ README.fedora.Gallery2 4 Jun 2009 13:51:19 -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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-9/gallery2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gallery2.spec 10 Dec 2008 21:04:31 -0000 1.18
+++ gallery2.spec 4 Jun 2009 13:51:19 -0000 1.19
@@ -7,21 +7,33 @@ URL: http://gallery.menalto.com
Name: gallery2
Version: 2.3
Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 12%{?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: 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
+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
%package albumselect
Summary: Albumselect module for Gallery 2
@@ -123,6 +135,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
@@ -216,12 +229,6 @@ Summary: Notification module for Gallery
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
@@ -272,10 +279,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
@@ -322,10 +329,10 @@ 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
@@ -347,10 +354,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
@@ -553,9 +560,6 @@ Gallery 2 module - Implementation of Nok
%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
@@ -586,8 +590,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
@@ -616,8 +620,8 @@ 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
@@ -632,8 +636,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
@@ -681,6 +685,8 @@ subalbums/other items not shown
%prep
%setup -q -n gallery2
#%patch0 -p1
+%patch1 -p0
+%patch2 -p0
%build
#pushd lib/tools/bin
@@ -696,16 +702,23 @@ 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
@@ -720,6 +733,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}
@@ -741,6 +755,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
@@ -763,11 +789,13 @@ echo and follow the instructions there t
%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,-)
@@ -921,10 +949,6 @@ echo and follow the instructions there t
%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/
@@ -965,9 +989,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,-)
@@ -1005,9 +1029,9 @@ echo and follow the instructions there t
%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,-)
@@ -1025,9 +1049,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,-)
@@ -1086,6 +1110,47 @@ echo and follow the instructions there t
%{installprefix}/gallery2/themes/tile/
%changelog
+* 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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 10 Dec 2008 21:04:31 -0000 1.9
+++ sources 4 Jun 2009 13:51:19 -0000 1.10
@@ -1 +1 @@
-59aa83d15989fdd05c623ef3563b800f gallery-2.3-full.zip
+f28f49f9042b5d2baec604bf43bfeb35 gallery-2.3-jarless.tar.gz
More information about the fedora-extras-commits
mailing list