SPECS: mysar.spec - updated to 2.1.4 - install subpackage - put sm...

[adamg]

Author: adamg                        Date: Thu Sep 13 11:11:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.1.4
- install subpackage
- put smarty cache in /var
- fix lighttpd config
- fix paths in cron entry
- log cron activity
- package some doc files
- works

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

---- Diffs:

================================================================
Index: SPECS/mysar.spec
diff -u SPECS/mysar.spec:1.2 SPECS/mysar.spec:1.3
--- SPECS/mysar.spec:1.2	Sat Aug  4 15:56:27 2007
+++ SPECS/mysar.spec	Thu Sep 13 13:11:02 2007
@@ -2,12 +2,14 @@
 Summary:	MySQL Squid Access Report
 Summary(pl.UTF-8):	Program raportujący dostęp do Squida
 Name:		mysar
-Version:	2.1.0
+Version:	2.1.4
 Release:	0.1
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://dl.sourceforge.net/mysar/%{name}-%{version}.tar.gz
-# Source0-md5:	c632dc1332508c7c031b3a11533d8b7e
+# Source0-md5:	4b570ace1b46ec3c13e0a048e9d6cf37
+Patch0:		%{name}-smarty_path.patch
+Patch1:		%{name}-cron.patch
 URL:		http://giannis.stoilis.gr/software/mysar/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	webapps
@@ -30,34 +32,50 @@
 MySQL Squid Access Report, w skrócie mysar, to system raportujący
 aktywność użytkowników na WWW logowaną poprzez proxy squid.
 
+%package install
+Summary:	Installation scripts for mysar
+Summary(pl.UTF-8): Skrypty instalacyjne dla mysar
+Group:		Applications/WWW
+Requires:	%{name} = %{version}-%{release}
+AutoReq:	no
+AutoProv:	no
+
+%description install
+This package provides installation scripts for mysar. 
+
+%description install -l pl.UTF-8
+Pakiet ten dostarcza skryptów instalacyjnych dla mysar.
+
 %prep
 %setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
 
 cat > apache.conf <<'EOF'
-Alias /%{name} %{_appdir}
-<Directory %{_appdir}>
+Alias /%{name} %{_appdir}/www
+<Directory %{_appdir}/www>
 	Allow from all
 </Directory>
 EOF
 
 cat > lighttpd.conf <<'EOF'
-Alias.url += ( "/phpMyBackupPro" => "%{_datadir}/phpMyBackupPro/")
+Alias.url += ( "/mysar/" => "%{_datadir}/mysar/www/")
 EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},/etc/cron.d}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/etc,/etc/cron.d}
+install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{_webapp}/smarty-tmp,/var/log/%{_webapp}}
 
 install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
-cp -af * $RPM_BUILD_ROOT%{_appdir}
+cp -af bin inc www www-templates* $RPM_BUILD_ROOT%{_appdir}
 rm -f $RPM_BUILD_ROOT%{_appdir}/etc/config,ini.example $RPM_BUILD_ROOT%{_appdir}/etc/mysar.cron
+rm -rf $RPM_BUILD_ROOT%{_appdir}/bin/mysar-binary-importer
 
 install etc/mysar.cron $RPM_BUILD_ROOT/etc/cron.d
-install etc/config.ini.example $RPM_BUILD_ROOT%{_sysconfdir}
-ln -sf %{_sysconfdir}/config.ini.example $RPM_BUILD_ROOT%{_appdir}/etc/config,ini.example
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,20 +100,30 @@
 
 %files
 %defattr(644,root,root,755)
+%doc CHANGELOG INSTALL README TODO UPGRADE etc/config.ini.example
 %dir %attr(750,root,http) %{_sysconfdir}
+%attr(750,root,root) %config(noreplace) /etc/cron.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %dir %{_appdir}
-%{_appdir}/bin
+%dir %{_sharedstatedir}/%{_webapp}
+%attr(770,root,http) %{_sharedstatedir}/%{_webapp}/smarty-tmp
+%dir %{_appdir}/bin
+%attr(750,root,root) %{_appdir}/bin/*.php
+%dir %{_appdir}/etc
 %{_appdir}/inc
-%{_appdir}/log
-%{_appdir}/smarty-tmp
 %{_appdir}/www-templates
 %{_appdir}/www-templates.pt_BR
 %{_appdir}/www
+%exclude %{_appdir}/www/install
 %{_appdir}/www-templates.fr_FR
 %{_appdir}/www-templates.ru_RU
+/var/log/mysar
+
+%files install
+%defattr(644,root,root,755)
+%{_appdir}/www/install
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +131,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/09/13 11:11:02  adamg
+- updated to 2.1.4
+- install subpackage
+- put smarty cache in /var
+- fix lighttpd config
+- fix paths in cron entry
+- log cron activity
+- package some doc files
+- works
+
 Revision 1.2  2007/08/04 13:56:27  qboosh
 - fixed encoding, cleanup
 
================================================================

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