From b1c0532d223cbd7822fa8bedc6f930dc5ade4905 Mon Sep 17 00:00:00 2001 From: topdog Date: Sep 29 2009 20:45:11 +0000 Subject: - initial import --- diff --git a/.cvsignore b/.cvsignore index e69de29..687c858 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +dokuwiki-2009-02-14b.tgz diff --git a/dokuwiki-use-fedora-email-valid.patch b/dokuwiki-use-fedora-email-valid.patch new file mode 100644 index 0000000..e808507 --- /dev/null +++ b/dokuwiki-use-fedora-email-valid.patch @@ -0,0 +1,12 @@ +diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php +--- dokuwiki-2009-02-14.orig/inc/mail.php 2009-02-14 14:13:25.000000000 +0200 ++++ dokuwiki-2009-02-14/inc/mail.php 2009-08-06 11:22:21.158226092 +0200 +@@ -8,7 +8,7 @@ + + if(!defined('DOKU_INC')) die('meh.'); + require_once(DOKU_INC.'inc/utf8.php'); +-require_once(DOKU_INC.'inc/EmailAddressValidator.php'); ++require_once('/usr/share/php/php-email-address-validation/EmailAddressValidator.php'); + + // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?) + // think different diff --git a/dokuwiki-use-fedora-geshi.patch b/dokuwiki-use-fedora-geshi.patch new file mode 100644 index 0000000..644b302 --- /dev/null +++ b/dokuwiki-use-fedora-geshi.patch @@ -0,0 +1,24 @@ +diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php +--- dokuwiki-2009-02-14.orig/inc/parserutils.php 2009-02-14 14:13:25.000000000 +0200 ++++ dokuwiki-2009-02-14/inc/parserutils.php 2009-08-06 11:07:47.476226013 +0200 +@@ -640,16 +640,16 @@ + $cache = getCacheName($language.$code,".code"); + $ctime = @filemtime($cache); + if($ctime && !$_REQUEST['purge'] && +- $ctime > filemtime(DOKU_INC.'inc/geshi.php') && // geshi changed +- $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && // language syntax definition changed ++ $ctime > filemtime('/usr/share/php/geshi.php') && // geshi changed ++ $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') && // language syntax definition changed + $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed + $highlighted_code = io_readFile($cache, false); + + } else { + +- require_once(DOKU_INC . 'inc/geshi.php'); ++ require_once('/usr/share/php/geshi.php'); + +- $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi'); ++ $geshi = new GeSHi($code, $language, '/usr/share/php/geshi'); + $geshi->set_encoding('utf-8'); + $geshi->enable_classes(); + $geshi->set_header_type(GESHI_HEADER_PRE); diff --git a/dokuwiki.spec b/dokuwiki.spec new file mode 100644 index 0000000..d77e721 --- /dev/null +++ b/dokuwiki.spec @@ -0,0 +1,152 @@ +Name: dokuwiki +Version: 0 +Release: 0.2.20090214.b%{?dist} +Summary: Standards compliant simple to use wiki +Group: Applications/Internet +License: GPLv2 +URL: http://www.dokuwiki.org/dokuwiki +Source0: http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz +#Fedora specific patches to use fedora packaged libraries +Patch1: dokuwiki-use-fedora-geshi.patch +#Patch2: dokuwiki-use-fedora-simplepie.patch +Patch3: dokuwiki-use-fedora-email-valid.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: php-gd +Requires: php-geshi +#Requires: php-simplepie +Requires: php-email-address-validation +Requires: httpd + +%description +DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating +documentation of any kind. It has a simple but powerful syntax which makes sure +the datafiles remain readable outside the Wiki and eases the creation of +structured texts. + +All data is stored in plain text files no database is required. + +%prep +%setup -q -n %{name}-2009-02-14 +%patch1 -p1 +#%patch2 -p1 +%patch3 -p1 + +mv -f conf/mysql.conf.php.example . + +sed -i "s:'./data':'%{_localstatedir}/lib/%{name}/data':" conf/%{name}.php +sed -i "s:ALL 8:ALL 1:" conf/acl.auth.php.dist + +cat <%{name}.httpd +# %{name} +# %{summary} +# %{version} +# + +Alias /%{name} %{_datadir}/%{name} + + + Options +FollowSymLinks + Order Allow,Deny + Allow from 127.0.0.1 + + + + Order Deny,Allow + Deny from all + + + + Order Deny,Allow + Deny from all + + + + Order Deny,Allow + Deny from all + + +EOF + +%build +# nothing to do here + +%install +rm -rf $RPM_BUILD_ROOT +install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d +install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name} +install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bin +install -d -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/{index,tmp,media,attic,pages,cache,meta,locks} +rm -f install.php +rm -rf inc/geshi* +rm -f inc/EmailAddressValidator.php +rm -f inc/.htaccess +rm -f inc/lang/.htaccess +#rm -f inc/SimplePie.php +rm -f lib/plugins/revert/lang/sk/intro.txt +cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/ +cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +cp -rp bin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/bin +cp -rp lib $RPM_BUILD_ROOT%{_datadir}/%{name}/ +cp -rp inc $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name} +install -p -m0644 %{name}.httpd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf + +pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +for d in *.dist; do + d0=`basename $d .dist` + if [ ! -f "$d0" ]; then + mv -f $d $d0 + fi +done +popd + +pushd $RPM_BUILD_ROOT%{_datadir}/%{name} + ln -sf ../../../etc/%name conf +popd + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc COPYING README VERSION mysql.conf.php.example +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/* +%dir %attr(0755,apache,apache) %{_sysconfdir}/%{name} +%attr(0755,apache,apache) %{_datadir}/%{name}/bin/*.php +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/conf +%{_datadir}/%{name}/*.php +%dir %{_datadir}/%{name}/lib +%{_datadir}/%{name}/lib/exe +%{_datadir}/%{name}/lib/images +%{_datadir}/%{name}/lib/index.html +%{_datadir}/%{name}/lib/scripts +%{_datadir}/%{name}/lib/styles +%{_datadir}/%{name}/lib/tpl +%attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins +%{_datadir}/%{name}/lib/plugins/* +%{_datadir}/%{name}/inc +%dir %{_localstatedir}/lib/%{name} +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/attic +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/cache +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/meta +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/locks +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/tmp +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/index +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground +%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki +%{_localstatedir}/lib/%{name}/data/pages/*/* + +%changelog +* Fri Aug 07 2009 Andrew Colin Kissa - 0-0.2.20090214.b +- Fixes requested by reviewer + +* Thu Aug 06 2009 Andrew Colin Kissa - 0-0.1.20090214.b +- Initial package diff --git a/import.log b/import.log new file mode 100644 index 0000000..1015020 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +dokuwiki-0-0_2_20090214_b_fc11:HEAD:dokuwiki-0-0.2.20090214.b.fc11.src.rpm:1254256989 diff --git a/sources b/sources index e69de29..dd48384 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c75c4781b8698041c3c9b6b0fec2ac2e dokuwiki-2009-02-14b.tgz