rpms/dokuwiki/F-11 .cvsignore, 1.2, 1.3 dokuwiki-use-fedora-email-valid.patch, 1.1, 1.2 dokuwiki-use-fedora-geshi.patch, 1.1, 1.2 dokuwiki.spec, 1.1, 1.2 sources, 1.2, 1.3

topdog topdog at fedoraproject.org
Wed Dec 9 13:09:55 UTC 2009 

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19249

Modified Files:
	.cvsignore dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec sources 
Log Message:
* Wed Dec 09 2009 Andrew Colin Kissa <andrew at topdog.za.net>
- Update to latest upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 20:54:10 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:09:55 -0000	1.3
@@ -1 +1 @@
-dokuwiki-2009-02-14b.tgz
+dokuwiki-rc2009-12-02.tgz

dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: dokuwiki-use-fedora-email-valid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki-use-fedora-email-valid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-email-valid.patch	29 Sep 2009 20:54:10 -0000	1.1
+++ dokuwiki-use-fedora-email-valid.patch	9 Dec 2009 13:09:55 -0000	1.2
@@ -1,6 +1,6 @@
-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
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
+--- dokuwiki-rc2009-12-02.orig/inc/mail.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-09 12:55:04.412961968 +0200
 @@ -8,7 +8,7 @@
  
  if(!defined('DOKU_INC')) die('meh.');

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: dokuwiki-use-fedora-geshi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki-use-fedora-geshi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-geshi.patch	29 Sep 2009 20:54:10 -0000	1.1
+++ dokuwiki-use-fedora-geshi.patch	9 Dec 2009 13:09:55 -0000	1.2
@@ -1,24 +1,25 @@
-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);
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
+--- dokuwiki-rc2009-12-02.orig/inc/parserutils.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-09 12:53:27.151961271 +0200
+@@ -641,16 +641,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 {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once('/usr/share/php/geshi.php');
+-        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);
+-        $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);
+


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki.spec	29 Sep 2009 20:54:10 -0000	1.1
+++ dokuwiki.spec	9 Dec 2009 13:09:55 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.2.20090214.b%{?dist}
+Release:	0.1.20091202.rc%{?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
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-rc2009-12-02.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-use-fedora-geshi.patch
 #Patch2:		dokuwiki-use-fedora-simplepie.patch
@@ -27,7 +27,7 @@ structured texts. 
 All data is stored in plain text files no database is required. 
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}-rc2009-12-02
 %patch1 -p1 
 #%patch2 -p1
 %patch3 -p1
@@ -48,7 +48,7 @@ Alias /%{name} %{_datadir}/%{name}
 <Directory %{_datadir}/%{name}>
 	Options +FollowSymLinks
 	Order Allow,Deny
-	Allow from 127.0.0.1
+	Allow from 127.0.0.1 ::1
 </Directory>
 
 <Directory %{_datadir}/%{name}/inc>
@@ -61,6 +61,12 @@ Alias /%{name} %{_datadir}/%{name}
 	Deny from all
 </Directory>
 
+<Directory %{_datadir}/%{name}/lib/_fla>
+	## no access to the fla directory
+	Order allow,deny
+	Deny from all
+</Directory>
+
 <Directory %{_sysconfdir}/%{name}>
 	Order Deny,Allow
 	Deny from all
@@ -84,7 +90,7 @@ 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/_fla/{.htaccess,README}
 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}
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
+%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -145,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
+- Upgrade to new upstream
+- Fix bugzilla bug #544257
+
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 20:54:10 -0000	1.2
+++ sources	9 Dec 2009 13:09:55 -0000	1.3
@@ -1 +1 @@
-c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz
+65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz

More information about the fedora-extras-commits mailing list