rpms/zikula/F-11 zikula-1.1.2-config.patch, NONE, 1.1 zikulahash.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 zikula.spec, 1.2, 1.3 zikula-1.1.1-config.patch, 1.1, NONE

Mon Aug 24 00:24:35 UTC 2009

Author: ke4qqq

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

Modified Files:
	.cvsignore import.log sources zikula.spec 
Added Files:
	zikula-1.1.2-config.patch zikulahash.patch 
Removed Files:
	zikula-1.1.1-config.patch 
Log Message:
* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
- upgraded to 1.1.2 to match upstream bug 514301
- changed php version requirements to 5.1.2 to remove bundling of sha256 library
- added symlinks silencing per ian wellers bug 511137
- silenced selinux problems
- Added requires for php-Smarty, php-adodb, php-mcrypt
- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237



zikula-1.1.2-config.patch:
 config.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zikula-1.1.2-config.patch ---
--- config/config.php	2008-06-06 14:03:14.000000000 +0200
+++ config/config.php.diff	2009-01-26 10:16:12.000000000 +0100
@@ -36,7 +36,7 @@
 global $PNConfig;
 $PNConfig['System']['installed']   = 0;         // installer will change this during installation
 $PNConfig['System']['tabletype']   = 'myisam';  // installer will change this during installation
-$PNConfig['System']['temp']        = 'pnTemp';  // installer will change this during installation
+$PNConfig['System']['temp']        = '/var/lib/zikula/pnTemp';  // installer will change this during installation
 $PNConfig['System']['prefix']      = 'zk';      // installer will change this during installation
 $PNConfig['System']['development'] = 0;         // should be set to 0/false when cutting a release for production use
 

zikulahash.patch:
 DataUtil.class.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zikulahash.patch ---
diff -rupN old/includes/DataUtil.class.php new/includes/DataUtil.class.php
--- includes/DataUtil.class.php	2008-12-08 13:31:42.000000000 -0500
+++ includes/DataUtil.class.php	2009-08-23 19:48:25.169290742 -0400
@@ -448,9 +448,9 @@ class DataUtil
                 return bin2hex(mhash(MHASH_SHA256, $string));
             } else {
                 if (!class_exists('SHA256')) {
-                    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
+                #    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
                 }
-                return SHA256::hash($string);
+                return hash('sha256', $string);
             }
         }
         else if ($type == 'md5') {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 16:03:44 -0000	1.2
+++ .cvsignore	24 Aug 2009 00:24:34 -0000	1.3
@@ -1 +1 @@
-Zikula-1.1.1-CORE.tar.gz
+Zikula-1.1.2-CORE.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Mar 2009 16:03:44 -0000	1.1
+++ import.log	24 Aug 2009 00:24:34 -0000	1.2
@@ -1 +1,2 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
+zikula-1_1_2-1_fc11:F-11:zikula-1.1.2-1.fc11.src.rpm:1251073425


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2009 16:03:44 -0000	1.2
+++ sources	24 Aug 2009 00:24:34 -0000	1.3
@@ -1 +1 @@
-d09fee4fc1f4756bff11f61c6d3797a1  Zikula-1.1.1-CORE.tar.gz
+585a1f8cec31fd33f64aa3968590a93d  Zikula-1.1.2-CORE.zip


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/zikula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zikula.spec	20 Aug 2009 19:25:10 -0000	1.2
+++ zikula.spec	24 Aug 2009 00:24:34 -0000	1.3
@@ -1,42 +1,55 @@
 Name: zikula
-Version: 1.1.1
-Release: 13%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Zikula is a free open source Web Application Framework
-Group:	Applications/Publishing
+Group:   Applications/Publishing
 License: GPLv2+
 # There is some content in this package that is LGPL with the bulk
 # GPLv2+ thus overall package should be GPLv2+ 
 URL: http://www.zikula.org/
-Source0: Zikula-%{version}-CORE.tar.gz 
+Source0: Zikula-%{version}-CORE.zip
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: zikula.conf
 #this is being discussed upstream - for the moment it is a fedora only file
 #see http://groups.google.com/group/zikula-discussions/browse_thread/thread/2f44d45a975d1515/
-Patch: %{name}-%{version}-config.patch
+Patch0: %{name}-%{version}-config.patch
 #Patch is recorded in ticket 901 on the zikula trac instance
+Patch1: %{name}hash.patch
+#Patch changes the sha256 hash function that's called to use php5's implementation.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 4.3
-Requires: php-mysql >= 4.3
-Requires: php-pgsql >= 4.3
+Requires: php >= 5.1.2
+Requires: php-mysql >= 5.1.2
+Requires: php-pgsql >= 5.1.2
+Requires: php-Smarty
+Requires: php-mcrypt
+Requires: php-adodb
+Requires: php-simplepie
+Requires: php-IDNA_Convert
+Requires: php-mbstring
+Requires: symlinks
+Requires(post): symlinks
 Requires(pre): policycoreutils
 
 %description
-Zikula is a free open source Web Application Framework. \
-It can be used to develop robust, secure, interactive and \
-editable websites and web based applications. Zikula is written \
-in PHP object oriented and fully modular. It requires a database \
- and may use all leading database platforms like MySQL, \
-PostgreSQL and Microsoft SQL Server. \
+A free open source Web Application Framework. 
+It can be used to develop robust, secure, interactive and 
+editable websites and web based applications. Zikula is written 
+in PHP, object oriented, and fully modular. It requires a database 
+ and may use all leading database platforms like MySQL, 
+PostgreSQL and Microsoft SQL Server. 
 Zikula is the successor to the PostNuke project.
 
 %pre
-semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || :
+semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
+semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
 
 %prep
 %setup -c -qn %{name}-%{version}
-%patch -p0 
+%patch0 -p0 
+%patch1 -p0
+dos2unix docs/Zikula_1_1_2-MYSQL.sql
 
 %build
 #nothing really for this section but rpmbuild complains if build is empty
@@ -48,6 +61,19 @@ rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
 
+# Following are deleted as Zikula checks the internal system looking for these libs
+# before using the 'bundled' versions. 
+rm -rf includes/classes/encryption
+rm -rf includes/classes/hashes
+rm -rf includes/classes/JSON
+
+# Following are deleted and symlinks will be created below to link to the 
+# appropriate site packages. 
+rm -rf includes/classes/Smarty
+rm -rf includes/classes/adodb
+rm -rf includes/classes/SimplePie
+rm -rf includes/classes/idna
+
 cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name}
 install -m 0644 *php robots.txt  %{buildroot}/%{_datadir}/%{name}
 
@@ -56,8 +82,11 @@ cp -pr pnTemp -t %{buildroot}/%{_localst
 install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php
 ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php
 install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf
-
-
+#ln -sf %{_datadir}/php/adodb/ %{buildroot}/%{_datadir}/%{name}/includes/classes/adodb || :
+#ln -sf %{_datadir}/php/Smarty/ %{buildroot}/%{_datadir}/%{name}/includes/classes/Smarty || :
+#ln -sf %{_datadir}/php/php-simplepie/ %{buildroot}/%{_datadir}/%{name}/includes/classes/SimplePie || :
+#ln -sf %{_datadir}/php/IDNA_Convert/ %{buildroot}/%{_datadir}/%{name}/includes/classes/idna || :
+#symlinks -crs %{buildroot}/%{_datadir}/%{name}/includes/
 rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess
 
 #changinng encoding
@@ -87,13 +116,26 @@ rm -rf %{buildroot}
 
 
 %post
-ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || :
-symlinks -crs /usr/share/zikula || :
+ln -sf /usr/share/doc/zikula-1.1.2 /usr/share/zikula/docs > /dev/null 2>&1 || :
+ln -sf /usr/share/php/adodb /usr/share/zikula/includes/classes/adodb > /dev/null 2>&1 || :
+ln -sf /usr/share/php/Smarty /usr/share/zikula/includes/classes/Smarty > /dev/null 2>&1 || :
+ln -sf /usr/share/php/php-simplepie /usr/share/zikula/includes/classes/SimplePie > /dev/null 2>&1 || :
+ln -sf /usr/share/php/IDNA_Convert /usr/share/zikula/includes/classes/idna > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+- upgraded to 1.1.2 to match upstream bug 514301
+- changed php version requirements to 5.1.2 to remove bundling of sha256 library
+- added symlinks silencing per ian wellers bug 511137
+- silenced selinux problems 
+- Added requires for php-Smarty, php-adodb, php-mcrypt
+- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237
+
 * Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
 - Upstream docs advise that PHP >= 4.3 is correct requirement
-
+ 
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 


--- zikula-1.1.1-config.patch DELETED ---


