template-specs: horde.spec - bring up to date

[glen]

Author: glen                         Date: Thu Sep 30 20:07:46 2010 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- bring up to date

---- Files affected:
template-specs:
   horde.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: template-specs/horde.spec
diff -u template-specs/horde.spec:1.16 template-specs/horde.spec:1.17
--- template-specs/horde.spec:1.16	Fri Oct 10 00:01:32 2008
+++ template-specs/horde.spec	Thu Sep 30 22:07:41 2010
@@ -1,51 +1,41 @@
 # $Revision$, $Date$
 # TODO
 # - lighttpd support
-%define	_hordeapp skeleton
-#define	_snap	2005-08-01
-#define	_rc		rc1
-%define	_rel	1
 
 # REPLACE words 'SKELETON', 'Skeleton', 'skeleton' with your application
 # GET THE Summary from here: http://www.horde.org/source/modules.php
 # 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:		horde-%{_hordeapp}
+Name:		horde-%{hordeapp}
 Version:	0.1
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	0.1
 License:	GPL v2 (CHECK IT FIRST, could be ASL)
 Group:		Applications/WWW
-# due builder limitations can't have complex macros in Source0
-#Source0:	ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}.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:	ftp://ftp.horde.org/pub/skeleton/%{hordeapp}-h3-%{version}.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:	%{_hordeapp}.conf
-Patch0:		%{_hordeapp}-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.264
-BuildRequires:	tar >= 1:1.15.1
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	webapps
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreq	'pear(Horde.*)'
-
 %define		hordedir	/usr/share/horde
-%define		_appdir		%{hordedir}/%{_hordeapp}
+%define		_appdir		%{hordedir}/%{hordeapp}
 %define		_webapps	/etc/webapps
-%define		_webapp		horde-%{_hordeapp}
+%define		_webapp		horde-%{hordeapp}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 
+%define		_noautoreq	pear(Horde.*)
+
 # GET DESCRIPTION FROM PROJECT URL
 %description
 SKELETON
@@ -62,8 +52,7 @@
 Skeleton) można znaleźć na stronie <http://www.horde.org/>.
 
 %prep
-%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
-tar zxf %{SOURCE0} --strip-components=1
+%setup -q -n %{hordeapp}-h3-%{version}
 
 rm {,*/}.htaccess
 for i in config/*.dist; do
@@ -84,8 +73,8 @@
 cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
 
 ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,7 +90,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/%{_hordeapp}.sql.gz | mysql horde
+	zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{hordeapp}.sql.gz | mysql horde
 EOF
 fi
 
@@ -143,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/09/30 20:07:41  glen
+- bring up to date
+
 Revision 1.16  2008/10/09 22:01:32  baggins
 - just copy CREDITS where horde wants it, instead of making a symlink
   (possibly pointing to nothingnes if package is installed with --excludedocs)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/horde.spec?r1=1.16&r2=1.17&f=u