rpms/gallery2/F-10 gallery2.spec,1.18,1.19

[Jon Ciesla]

Author: limb

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

Modified Files:
	gallery2.spec 
Log Message:
* 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.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gallery2.spec	10 Dec 2008 20:49:54 -0000	1.18
+++ gallery2.spec	4 Feb 2009 20:46:01 -0000	1.19
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream will not work - must use SVN snapshot
@@ -16,7 +16,7 @@
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
 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
@@ -702,9 +702,11 @@
 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
+#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
@@ -1086,6 +1088,12 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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.