SPECS: nocc.spec - updated to 1.6 - config files changed

[luzik]

Author: luzik                        Date: Sat Jul 26 09:12:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.6
- config files changed

---- Files affected:
SPECS:
   nocc.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/nocc.spec
diff -u SPECS/nocc.spec:1.43 SPECS/nocc.spec:1.44
--- SPECS/nocc.spec:1.43	Thu Aug  9 19:33:35 2007
+++ SPECS/nocc.spec	Sat Jul 26 11:12:09 2008
@@ -3,13 +3,13 @@
 Summary:	WebMail package
 Summary(pl.UTF-8):	Poczta przez WWW
 Name:		nocc
-Version:	1.4
+Version:	1.6
 #Release:	0.%{_snap}.1
 Release:	1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/nocc/%{name}-%{version}.tar.gz
-# Source0-md5:	82624a1bb8ab8482b9dcf7f1de60b143
+# Source0-md5:	2c60e059e1451ec56201866964258584
 #Source0:	http://nocc.sourceforge.net/download/%{name}_snapshot.tar.gz
 Patch0:		%{name}-config.patch
 URL:		http://nocc.sourceforge.net/
@@ -37,7 +37,7 @@
 pocztowych IMAP i POP3 przez WWW.
 
 %prep
-%setup -q
+%setup -q -c %{name}-%{version}
 #%setup -q -n %{name}
 #cd webmail
 %patch0 -p1
@@ -62,15 +62,15 @@
 install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
+install config/conf.php.dist config/conf.php
+mv config $RPM_BUILD_ROOT%{_sysconfdir}/
 cp -avR * $RPM_BUILD_ROOT%{_appdir}
 
-install conf.php.dist $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-ln -s %{_sysconfdir}/conf.php $RPM_BUILD_ROOT%{_appdir}/conf.php
+ln -s %{_sysconfdir}/config $RPM_BUILD_ROOT%{_appdir}/
 
 rm -rf $RPM_BUILD_ROOT%{_appdir}/docs
 rm -f $RPM_BUILD_ROOT%{_appdir}/{COPYING,INSTALL,README,*.sh}
 rm -rf $RPM_BUILD_ROOT%{_appdir}/debian
-rm -f $RPM_BUILD_ROOT%{_appdir}/conf.php.dist
 rm -f $RPM_BUILD_ROOT%{_appdir}/lang/*.sh
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
@@ -95,11 +95,11 @@
 #%doc webmail/conf.php.dist
 %doc docs/*
 %doc addcgipath.sh
-%doc conf.php.dist
 %dir %attr(750,root,http) %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}/config
 %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,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config/*
 %attr(770,root,http) %dir %{_var}/lib/nocc
 %{_appdir}
 
@@ -109,6 +109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2008/07/26 09:12:09  luzik
+- updated to 1.6
+- config files changed
+
 Revision 1.43  2007/08/09 17:33:35  tommat
 - up to 1.4, STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nocc.spec?r1=1.43&r2=1.44&f=u