SPECS: template-horde.spec - updated

[glen]

Author: glen                         Date: Sat Sep 17 15:36:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated

---- Files affected:
SPECS:
   template-horde.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/template-horde.spec
diff -u SPECS/template-horde.spec:1.4 SPECS/template-horde.spec:1.5
--- SPECS/template-horde.spec:1.4	Wed Aug 24 19:05:14 2005
+++ SPECS/template-horde.spec	Sat Sep 17 17:36:25 2005
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
+%define	_hordeapp skeleton
+#define	_snap	2005-08-01
 #define	_rc		rc1
-%define	_snap	2005-08-01
 %define	_rel	1
 
 # REPLACE words 'SKELETON', 'Skeleton', 'skeleton' with your application
@@ -8,23 +9,23 @@
 # FIND .htaccess FILES AND MAKE SURE APACHE CONF DISABLES ACCESS TO
 # THOSE DIRS: find -name '.??*' IS EASY TO LOCATE.
 
-%define		_hordeapp	skeleton
 %include	/usr/lib/rpm/macros.php
 Summary:	Template for horde projects
-Name:		skeleton
+Name:		%{_hordeapp}
 Version:	0.1
-Release:	%{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	GPL v2 (CHECK IT FIRST, could be ASL)
 Group:		Applications/WWW
+# due builder limitations can't have complrex macros in Source0
 #Source0:	ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}.tar.gz
-#Source0:	ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}-%{_rc}.tar.gz
+#Source0:	ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
 #Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 # Source0-md5:	-
 # COPY IN SOURCES ../SOURCES/ingo.conf AS SOURCE1 HERE:
 # cp ../SOURCES/{ingo,skeleton}.conf
 # DON'T FORGET TO :%s#ingo#skeleton#g in that file
-Source1:	%{name}.conf
-Patch0:		%{name}-prefs.patch
+Source1:	%{_hordeapp}.conf
+Patch0:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/skeleton/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
@@ -59,7 +60,7 @@
 Skeleton) można znaleźć na stronie <http://www.horde.org/>.
 
 %prep
-%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}}
+%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
 tar zxf %{SOURCE0} --strip-components=1
 
 # considered harmful (horde/docs/SECURITY)
@@ -67,25 +68,24 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
 	$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
 
-cp -pR	*.php			$RPM_BUILD_ROOT%{_appdir}
+cp -a *.php			$RPM_BUILD_ROOT%{_appdir}
 for i in config/*.dist; do
-	cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
+	cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
 done
-echo "<?php ?>" > 		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
-install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
+echo '<?php ?>' >		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
+cp -p config/conf.xml	$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+touch					$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
 
 cp -pR	lib/*			$RPM_BUILD_ROOT%{_appdir}/lib
 cp -pR	locale/*		$RPM_BUILD_ROOT%{_appdir}/locale
 cp -pR	templates/*		$RPM_BUILD_ROOT%{_appdir}/templates
 cp -pR	themes/*		$RPM_BUILD_ROOT%{_appdir}/themes
 
-ln -s %{_sysconfdir}/%{_hordeapp} 	$RPM_BUILD_ROOT%{_appdir}/config
+ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config
 ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
 
 %clean
@@ -102,7 +102,7 @@
 	IMPORTANT:
 	If you are installing Skeleton for the first time, You may need to
 	create the Skeleton database tables. To do so run:
-	zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{name}.sql.gz | mysql horde
+	zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{_hordeapp}.sql.gz | mysql horde
 EOF
 fi
 
@@ -143,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/09/17 15:36:25  glen
+- updated
+
 Revision 1.4  2005/08/24 17:05:14  glen
 - %{_hordeapp} macro, unify
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.4&r2=1.5&f=u