- strip core/ from paths, move ckfinder.html to base package

Changed files:
    apache.conf -> 1.2
    ckfinder.spec -> 1.5

diff --git a/apache.conf b/apache.conf
index 51cd450aa34ab601a771e98c22996f9c0a38b36a..da501768725ac6ed6d3ac963354a9a6c920bd621 100644 (file)
--- a/apache.conf
+++ b/apache.conf
@@ -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

diff --git a/ckfinder.spec b/ckfinder.spec
index e8d363c584b28a15e8d42b74a7de536723b2708a..51b7b07d9e50a4e1e75c44225255818556c7171c 100644 (file)
--- a/ckfinder.spec
+++ b/ckfinder.spec
@@ -2,7 +2,7 @@ Summary:        AJAX file manager for web browsers
 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
@@ -72,6 +72,9 @@ rm -r core/connector/php/php4
 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
@@ -84,6 +87,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{php_data_dir},/var/lib/%{
 
 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}
 
@@ -93,7 +97,6 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 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
 
@@ -132,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_appdir}/help
 %dir %{_appdir}/skins
 %{_appdir}/ckfinder.js
+%{_appdir}/ckfinder.html
 %{_appdir}/css
 %{_appdir}/images
 %{_appdir}/js