Author: glen Date: Mon Mar 10 13:54:47 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- HEAD merge
---- Files affected:
SPECS:
dokuwiki.spec (1.3.2.3 -> 1.3.2.4)
---- Diffs:
================================================================
Index: SPECS/dokuwiki.spec
diff -u SPECS/dokuwiki.spec:1.3.2.3 SPECS/dokuwiki.spec:1.3.2.4
--- SPECS/dokuwiki.spec:1.3.2.3 Mon Mar 10 11:27:40 2008
+++ SPECS/dokuwiki.spec Mon Mar 10 14:54:42 2008
@@ -14,8 +14,9 @@
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: %{name}-find-lang.sh
-#Source4: jude.png
+Source4: jude.png
Source5: eventum.gif
+# Source4-md5: 623344128960e18f86097dfee213ad4a
Patch0: %{name}-paths.patch
Patch1: %{name}-config.patch
Patch2: %{name}-mysqlauth.patch
@@ -33,6 +34,8 @@
Requires: webserver(alias)
Requires: webserver(php) >= 4.3.3
Suggests: php(gd)
+# can use gz compression to store attic pages
+Suggests: php(zlib)
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -101,7 +104,9 @@
install -d
$RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-cp -a bin inc lib $RPM_BUILD_ROOT%{_appdir}
+cp -a bin/* $RPM_BUILD_ROOT%{_appdir}/bin
+cp -a inc/* $RPM_BUILD_ROOT%{_appdir}/inc
+cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}
cp -a data/* $RPM_BUILD_ROOT%{_localstatedir}
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -116,13 +121,11 @@
touch $RPM_BUILD_ROOT%{_sysconfdir}/smileys.local.conf
ln $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/{dokubug,bug}.gif
-#cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons
cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/eventum.gif
# find locales
sh %{SOURCE3} %{name}.lang
-ln -s %{_localstatedir} $RPM_BUILD_ROOT%{_appdir}/data
-ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -268,6 +271,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3.2.4 2008-03-10 13:54:42 glen
+- HEAD merge
+
Revision 1.3.2.3 2008-03-10 10:27:40 paszczus
- started merge from HEAD
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki.spec?r1=1.3.2.3&r2=1.3.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
