packages: phorum/paths.patch, phorum/phorum.spec - fs structure fixes
glen
glen at pld-linux.org
Wed Jan 6 19:19:00 CET 2010
Author: glen Date: Wed Jan 6 18:19:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fs structure fixes
---- Files affected:
packages/phorum:
paths.patch (1.7 -> 1.8) , phorum.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: packages/phorum/paths.patch
diff -u packages/phorum/paths.patch:1.7 packages/phorum/paths.patch:1.8
--- packages/phorum/paths.patch:1.7 Wed Jan 6 18:30:14 2010
+++ packages/phorum/paths.patch Wed Jan 6 19:18:55 2010
@@ -182,3 +182,48 @@
include_once("./common.php");
if(!phorum_check_read_common()) {
+--- phorum/include/admin/header.php~ 2009-07-22 14:58:57.000000000 +0300
++++ phorum/include/admin/header.php 2010-01-06 20:02:05.938378394 +0200
+@@ -36,7 +36,7 @@
+
+ // set the path to the CSS file to pull in
+ $default_admin_css_file = 'default.css';
+- $admin_css_path = $PHORUM["http_path"].'/include/admin/css/' . $default_admin_css_file;
++ $admin_css_path = $PHORUM["http_path"].'/admin/css/' . $default_admin_css_file;
+
+ /**
+ * [hook]
+--- phorum/include/admin/css/default.css~ 2010-01-06 20:13:13.000000000 +0200
++++ phorum/include/admin/css/default.css 2010-01-06 20:13:19.085201493 +0200
+@@ -118,19 +118,19 @@
+ .icon-folder-up {
+ width: 22px;
+ padding-left: 22px;
+- background: url(../../../images/folder_up.png) 0 1px no-repeat;
++ background: url(../../images/folder_up.png) 0 1px no-repeat;
+ }
+
+ .icon-folder {
+ width: 22px;
+ padding-left: 22px;
+- background: url(../../../images/folder.png) 0 1px no-repeat;
++ background: url(../../images/folder.png) 0 1px no-repeat;
+ }
+
+ .icon-forum {
+ width: 22px;
+ padding-left: 22px;
+- background: url(../../../images/forum.png) 0 1px no-repeat;
++ background: url(../../images/forum.png) 0 1px no-repeat;
+ }
+
+ .PhorumAdminTableHead
+@@ -154,7 +154,7 @@
+
+ .PhorumAdminError
+ {
+- background-image: url("../../../images/alert.gif");
++ background-image: url("../../images/alert.gif");
+ background-position: 5px 5px;
+ background-repeat: no-repeat;
+ font-family: Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica;
================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.27 packages/phorum/phorum.spec:1.28
--- packages/phorum/phorum.spec:1.27 Wed Jan 6 18:30:14 2010
+++ packages/phorum/phorum.spec Wed Jan 6 19:18:55 2010
@@ -3,14 +3,14 @@
Summary(pl.UTF-8): Phorum - implementacja forum WWW w PHP
Name: phorum
Version: 5.2.14
-Release: 0.1
+Release: 0.3
License: Apache-like
Group: Applications/WWW
Source0: http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
# Source0-md5: 944211b4f195a538bcb6e2883d2187c5
-Source1: %{name}-apache.conf
-Patch0: %{name}-paths.patch
-Patch1: %{name}-mysql.patch
+Source1: apache.conf
+Patch0: paths.patch
+Patch1: mysql.patch
Patch2: docsurl.patch
URL: http://www.phorum.org/
BuildRequires: rpmbuild(macros) >= 1.268
@@ -57,30 +57,42 @@
%prep
%setup -q
+find '(' -name '*.php' -o -name '*.css' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
-rm {scripts,templates,cache,portable,include,mods}/.htaccess
+# htaccess will be provided by apache.conf
+find -name .htaccess | xargs rm -v
+
mv include/db/config.php.sample .
mv include/api/examples docs/api_examples
# kill old files by phorum
rm post.php
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/htdocs/templates/default,/var/cache/phorum}
+# fixup structure, move public files to htdocs.
+install -d htdocs/admin
+mv *.php images htdocs
-cp -a *.php images $RPM_BUILD_ROOT%{_appdir}/htdocs
-mv $RPM_BUILD_ROOT%{_appdir}/{htdocs/,}common.php
+# common.php still private
+mv htdocs/common.php .
-cp -a include mods templates $RPM_BUILD_ROOT%{_appdir}
+# admin css
+mv include/admin/css htdocs/admin
+
+# samples
+mv portable scripts docs
# TODO: move themes images to htdocs
#mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
#mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/htdocs/templates/default,/var/cache/phorum}
+cp -a *.php htdocs include mods templates $RPM_BUILD_ROOT%{_appdir}
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -a config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
@@ -113,7 +125,7 @@
%files
%defattr(644,root,root,755)
-%doc docs/* scripts portable
+%doc docs/*
%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
@@ -125,8 +137,10 @@
%{_appdir}/mods
%dir %{_appdir}/include
+%dir %{_appdir}/include/db
+%{_appdir}/include/db/mysql
+%{_appdir}/include/db/mysql.php
%{_appdir}/include/*.php
-%{_appdir}/include/db
%{_appdir}/include/controlcenter
%{_appdir}/include/lang
%{_appdir}/include/posting
@@ -167,8 +181,10 @@
%files setup
%defattr(644,root,root,755)
+%{_appdir}/htdocs/admin
%{_appdir}/htdocs/admin.php
%{_appdir}/include/admin
+%{_appdir}/include/db/upgrade
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -176,6 +192,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2010/01/06 18:18:55 glen
+- fs structure fixes
+
Revision 1.27 2010/01/06 17:30:14 glen
- prepare for 5.2.14
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/paths.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.27&r2=1.28&f=u
More information about the pld-cvs-commit
mailing list