rpms/gallery2/F-7 gallery2.spec,1.14,1.15

John Berninger (jwb) fedora-extras-commits at redhat.com
Thu Mar 20 18:15:12 UTC 2008


Author: jwb

Update of /cvs/pkgs/rpms/gallery2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3643

Modified Files:
	gallery2.spec 
Log Message:
update to use smarty from php-Smarty


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-7/gallery2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gallery2.spec	29 Dec 2007 14:01:18 -0000	1.14
+++ gallery2.spec	20 Mar 2008 18:14:31 -0000	1.15
@@ -7,14 +7,16 @@
 Name: gallery2
 Version: 2.2.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
-Source0: http://dl.sf.net/gallery/gallery-%{version}-developer.tar.gz
+# Source0: http://dl.sf.net/gallery/gallery-%{version}-developer.tar.gz
+# Tarball from upstream will not work - must use SVN snapshot
+Source0: gallery-2.2.svn.tar.gz
 Source1: gallery2-httpd-conf
 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
+Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty
 BuildArch: noarch
 # Subversion needed to generate manifest
 BuildRequires: perl-String-CRC32, subversion
@@ -675,6 +677,8 @@
 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
 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
 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
@@ -1045,6 +1049,10 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Mar 20 2008 John Berninger <john at ncphotography dot com> - 2.2.4-3
+- revert to SVN snapshot so that config-time integrity checks don't fail
+- remove embedded copy of smarty and use php-Smarty package
+
 * Sat Dec 29 2007 John Berninger <john at ncphotography dot com) - 2.2.4-2
 - BZ 279961 - allow FileInfo
 




More information about the fedora-extras-commits mailing list