rpms/gallery2/F-8 .cvsignore, 1.4, 1.5 gallery2.spec, 1.14, 1.15 sources, 1.6, 1.7

[John Berninger (jwb)]

Author: jwb

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

Modified Files:
	.cvsignore gallery2.spec sources 
Log Message:
use php-Smarty, remove embedded copy of Smarty


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Dec 2007 18:23:44 -0000	1.4
+++ .cvsignore	20 Mar 2008 18:04:58 -0000	1.5
@@ -1 +1 @@
-gallery-2.2.4-developer.tar.gz
+gallery-2.2.svn.tar.gz


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-8/gallery2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gallery2.spec	29 Dec 2007 14:01:27 -0000	1.14
+++ gallery2.spec	20 Mar 2008 18:04:58 -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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Dec 2007 18:23:44 -0000	1.6
+++ sources	20 Mar 2008 18:04:58 -0000	1.7
@@ -1 +1 @@
-17e099971c1ceba939f694f96571be6a  gallery-2.2.4-developer.tar.gz
+7f10a8605f2b69a49929f757fc2b4a92  gallery-2.2.svn.tar.gz