packages: ckfinder/apache.conf, ckfinder/ckfinder.spec - strip core/ from p...

[glen]

Author: glen                         Date: Thu May 27 09:08:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- strip core/ from paths, move ckfinder.html to base package

---- Files affected:
packages/ckfinder:
   apache.conf (1.1 -> 1.2) , ckfinder.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/ckfinder/apache.conf
diff -u packages/ckfinder/apache.conf:1.1 packages/ckfinder/apache.conf:1.2
--- packages/ckfinder/apache.conf:1.1	Tue Feb 16 14:27:34 2010
+++ packages/ckfinder/apache.conf	Thu May 27 11:08:02 2010
@@ -1,5 +1,5 @@
 Alias /ckfinder/userfiles/ /var/lib/ckfinder/
-Alias /ckfinder/core/ /usr/share/ckfinder/
+Alias /ckfinder/ /usr/share/ckfinder/
 
 <Directory /usr/share/ckfinder>
 	Allow from all

================================================================
Index: packages/ckfinder/ckfinder.spec
diff -u packages/ckfinder/ckfinder.spec:1.4 packages/ckfinder/ckfinder.spec:1.5
--- packages/ckfinder/ckfinder.spec:1.4	Thu May 27 00:04:34 2010
+++ packages/ckfinder/ckfinder.spec	Thu May 27 11:08:03 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Edytor tekstowy dla Internetu
 Name:		ckfinder
 Version:	1.4.2
-Release:	0.20
+Release:	0.21
 License:	Custom
 Group:		Applications/WWW
 Source0:	http://download.cksource.com/CKFinder/CKFinder%20for%20PHP/%{version}/%{name}_php_%{version}.tar.gz
@@ -73,6 +73,9 @@
 mv core/connector/php/php5/* core/connector/php
 rmdir core/connector/php/php5
 
+# kill core/ in path
+%{__grep} -r core/ . -l | xargs %{__sed} -i -e 's,core/,,'
+
 %undos -f js,css,txt,html,php
 
 %patch0 -p1
@@ -85,6 +88,7 @@
 
 cp -a ckfinder.js $RPM_BUILD_ROOT%{_appdir}
 cp -a core/* $RPM_BUILD_ROOT%{_appdir}
+cp -a ckfinder.html $RPM_BUILD_ROOT%{_appdir}
 cp -a config.php $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a ckfinder.php $RPM_BUILD_ROOT%{php_data_dir}
 
@@ -94,7 +98,6 @@
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a _samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a ckfinder.html $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %find_lang %{name}.lang
 
@@ -133,6 +136,7 @@
 %dir %{_appdir}/help
 %dir %{_appdir}/skins
 %{_appdir}/ckfinder.js
+%{_appdir}/ckfinder.html
 %{_appdir}/css
 %{_appdir}/images
 %{_appdir}/js
@@ -171,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/05/27 09:08:03  glen
+- strip core/ from paths, move ckfinder.html to base package
+
 Revision 1.4  2010/05/26 22:04:34  glen
 - add fckeditor-like config overloading
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ckfinder/apache.conf?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ckfinder/ckfinder.spec?r1=1.4&r2=1.5&f=u