SPECS: joomla.spec - builds fine

[baggins]

Author: baggins                      Date: Thu Feb  2 18:16:53 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds fine

---- Files affected:
SPECS:
   joomla.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/joomla.spec
diff -u SPECS/joomla.spec:1.2 SPECS/joomla.spec:1.3
--- SPECS/joomla.spec:1.2	Thu Feb  2 18:53:44 2006
+++ SPECS/joomla.spec	Thu Feb  2 19:16:47 2006
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - webapp support
-#
 Summary:	Content management system
 Name:		joomla
 Version:	1.0.7
@@ -11,6 +8,7 @@
 # http://developer.joomla.org/sf/frs/do/downloadFile/projects.joomla/frs.joomla_1_0.1_0_7/frs3338
 Source0:	Joomla_%{version}-Stable-Full_Package.tar.bz2
 # Source0-md5:	a1ba209fb7ba2d73670fdb8106f2079e
+Source1:	%{name}-http.conf
 Patch0:		%{name}-config.patch
 URL:		http://www.joomla.org/
 Requires:	php
@@ -19,12 +17,15 @@
 Requires:	php-pcre
 Requires:	php-session
 Requires:	apache >= 2.0
+Requires:	webapps
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_joomladir	%{_datadir}/%{name}
-%define		_joomladata	/var/lib/moodle
-%define		_sysconfdir	/etc/%{name}
+%define		_joomladata	/var/lib/%{name}
+%define		_webapps	/etc/webapps
+%define		_webapp		%{name}
+%define		_sysconfdir	%{_webapps}/%{_webapp}
 
 %description
 Joomla! is one of the most powerful Open Source Content Management
@@ -34,32 +35,70 @@
 
 %prep
 %setup -q -c
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_joomladir},%{_joomladata},%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT{%{_joomladir},%{_sysconfdir}} \
+	$RPM_BUILD_ROOT%{_joomladata}/{administrator,uploadfiles}
 
 # Instalation:
 cp -R * $RPM_BUILD_ROOT%{_joomladir}
 
+mv -f $RPM_BUILD_ROOT%{_joomladir}/administrator/backups $RPM_BUILD_ROOT%{_joomladata}/administrator/
+mv -f $RPM_BUILD_ROOT%{_joomladir}/{cache,images,media} $RPM_BUILD_ROOT%{_joomladata}/
+ln -sf %{_joomladata}/administrator/backups $RPM_BUILD_ROOT%{_joomladir}/administrator/backups
+ln -sf %{_joomladata}/cache $RPM_BUILD_ROOT%{_joomladir}/cache
+ln -sf %{_joomladata}/images $RPM_BUILD_ROOT%{_joomladir}/images
+ln -sf %{_joomladata}/media $RPM_BUILD_ROOT%{_joomladir}/media
+ln -sf %{_joomladata}/uploadfiles $RPM_BUILD_ROOT%{_joomladir}/uploadfiles
+
 # Play with configs:
 sed -e 's|@JOOMLADIR@|%{_joomladir}|g' -e 's|@JOOMLADATA@|%{_joomladata}|g' \
 	$RPM_BUILD_ROOT%{_joomladir}/configuration.php-dist > $RPM_BUILD_ROOT%{_sysconfdir}/configuration.php
 ln -sf %{_sysconfdir}/configuration.php $RPM_BUILD_ROOT%{_joomladir}/configuration.php
 
-#install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
 %files
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/configuration.php
-#%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %dir %{_joomladir}
-%{_joomladir}/*.php
+%{_joomladir}/*
 %attr(771,root,http) %dir %{_joomladata}
+%attr(771,root,http) %dir %{_joomladata}/administrator
+%attr(771,root,http) %dir %{_joomladata}/administrator/backups
+%attr(771,root,http) %dir %{_joomladata}/cache
+%attr(771,root,http) %dir %{_joomladata}/images
+%attr(771,root,http) %dir %{_joomladata}/images/M_images
+%attr(771,root,http) %dir %{_joomladata}/images/banners
+%attr(771,root,http) %dir %{_joomladata}/images/smilies
+%attr(771,root,http) %dir %{_joomladata}/images/stories
+%attr(771,root,http) %dir %{_joomladata}/images/stories/food
+%attr(771,root,http) %dir %{_joomladata}/images/stories/fruit
+%attr(771,root,http) %dir %{_joomladata}/media
+%attr(771,root,http) %dir %{_joomladata}/uploadfiles
+%dir %{_joomladata}/administrator/backups/*
+%dir %{_joomladata}/cache/*
+%dir %{_joomladata}/images/*.*
+%dir %{_joomladata}/images/M_images/*
+%dir %{_joomladata}/images/banners/*
+%dir %{_joomladata}/images/smilies/*
+%dir %{_joomladata}/images/stories/*.*
+%dir %{_joomladata}/images/stories/food/*
+%dir %{_joomladata}/images/stories/fruit/*
+%dir %{_joomladata}/media/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/02/02 18:16:47  baggins
+- builds fine
+
 Revision 1.2  2006/02/02 17:53:44  baggins
 - something screwed my local repo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/joomla.spec?r1=1.2&r2=1.3&f=u