rpms/gallery2/devel gallery2.spec,1.25,1.26

[Jon Ciesla]

Author: limb

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

Modified Files:
	gallery2.spec 
Log Message:
Hope. . .hope. . .



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gallery2.spec	28 Apr 2009 16:25:40 -0000	1.25
+++ gallery2.spec	11 May 2009 14:14:57 -0000	1.26
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 8%{?dist}
+Release: 9%{?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.
@@ -132,6 +132,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
@@ -726,20 +727,11 @@ 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}
 
-%pretrans
-#symlink to system smarty
-if [ -d /usr/share/gallery2/lib/smarty ]; then
-  rm -rf /usr/share/gallery2/lib/smarty
-fi
-if [ ! -e /usr/share/gallery2/lib/smarty ]; then
-  ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
-fi
-
 %post
 if [[ -f %{installprefix}/gallery2/config.php.rpmnew ]]
 then
@@ -757,6 +749,13 @@ 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 
+
+
 %files
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/bootstrap.inc
@@ -784,6 +783,7 @@ echo and follow the instructions there t
 %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,-)
@@ -1098,6 +1098,10 @@ echo and follow the instructions there t
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* 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.