From 37454f2143fb11341aa64491065bb7fb7277e301 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 30 Sep 2010 20:07:41 +0000 Subject: [PATCH] - bring up to date Changed files: horde.spec -> 1.17 --- horde.spec | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/horde.spec b/horde.spec index f221f83..c49e71b 100644 --- a/horde.spec +++ b/horde.spec @@ -1,50 +1,40 @@ # 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 @@ -61,8 +51,7 @@ General Public License. Więcej informacji (włącznie z pomocą dla Skeleton) można znaleźć na stronie . %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 @@ -83,8 +72,8 @@ cp -a lib locale templates themes $RPM_BUILD_ROOT%{_appdir} 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 @@ -100,7 +89,7 @@ if [ "$1" = 1 ]; then 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 -- 2.44.0