SPECS: sugarcrm.spec - files outside dir in main tar - resolve con...

[glen]

Author: glen                         Date: Mon Feb  6 14:46:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- files outside dir in main tar
- resolve conflicting manifest.php files in language files

---- Files affected:
SPECS:
   sugarcrm.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/sugarcrm.spec
diff -u SPECS/sugarcrm.spec:1.9 SPECS/sugarcrm.spec:1.10
--- SPECS/sugarcrm.spec:1.9	Mon Feb  6 05:14:25 2006
+++ SPECS/sugarcrm.spec	Mon Feb  6 15:46:23 2006
@@ -69,7 +69,13 @@
 trzymanie plików instalacyjnych może być niebezpieczne.
 
 %prep
-%setup -q -n SugarSuite-Full-%{version} -a 10 -a 12 -a 13
+%setup -qc
+cd SugarSuite-Full-%{version}
+rm jscalendar/lang/calendar-pl.js # language zip contains better version
+%{__unzip} -qq %{SOURCE10} -x manifest.php
+%{__unzip} -qq %{SOURCE12} -x manifest.php
+%{__unzip} -qq %{SOURCE13} -x manifest.php
+
 # undos the sources
 find -regex '.*\.\(php\|inc\|html\|txt\|js\)$' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
@@ -77,6 +83,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd SugarSuite-Full-%{version}
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}
 
 cp -a */ $RPM_BUILD_ROOT%{_appdir}
@@ -138,7 +145,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALLATION.txt LICENSE PATCH.txt README.txt UPGRADE.TXT
+%doc SugarSuite-Full-%{version}/{INSTALLATION.txt,LICENSE,PATCH.txt,README.txt,UPGRADE.TXT}
 %dir %attr(750,root,http) %{_sysconfdir}
 %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
@@ -152,7 +159,6 @@
 %{_appdir}/metadata
 %{_appdir}/soap
 %{_appdir}/themes
-%{_appdir}/upgrade
 %{_appdir}/*.txt
 %{_appdir}/*.html
 %{_appdir}/[!i]*.php
@@ -176,6 +182,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/02/06 14:46:23  glen
+- files outside dir in main tar
+- resolve conflicting manifest.php files in language files
+
 Revision 1.9  2006/02/06 04:14:25  wolvverine
 - correct source
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sugarcrm.spec?r1=1.9&r2=1.10&f=u