From ad5108842a5699bc62b6942ca44a5ac0f2348600 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 20 Mar 2009 02:52:41 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for zikula --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 6bb2344aaaf631101787d7a02cddf704bacc6e2a Mon Sep 17 00:00:00 2001 From: David Nalley Date: Fri, 20 Mar 2009 16:06:51 +0000 Subject: [PATCH 2/4] - Initial commit --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-1.1.1-config.patch | 11 +++ zikula.conf | 102 +++++++++++++++++++++++++++ zikula.spec | 142 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 258 insertions(+) create mode 100644 import.log create mode 100644 zikula-1.1.1-config.patch create mode 100644 zikula.conf create mode 100644 zikula.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3196e30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Zikula-1.1.1-CORE.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..dc57bf0 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-1_1_1-12_fc10:F-9:zikula-1.1.1-12.fc10.src.rpm:1237565053 diff --git a/sources b/sources index e69de29..b21310c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d09fee4fc1f4756bff11f61c6d3797a1 Zikula-1.1.1-CORE.tar.gz diff --git a/zikula-1.1.1-config.patch b/zikula-1.1.1-config.patch new file mode 100644 index 0000000..57127fb --- /dev/null +++ b/zikula-1.1.1-config.patch @@ -0,0 +1,11 @@ +--- 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 + diff --git a/zikula.conf b/zikula.conf new file mode 100644 index 0000000..1a84986 --- /dev/null +++ b/zikula.conf @@ -0,0 +1,102 @@ +#conf file for dedicated server installs of Zikula. +# v0.1 David Nalley - Initial consolidation of .htaccess files from Zikulasource +# +Alias /zikula /usr/share/zikula + + order deny,allow + allow from all + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + SetEnvIf Request_URI "\.jpg$" object_is_jpg=jpg + SetEnvIf Request_URI "\.gif$" object_is_gif=gif + SetEnvIf Request_URI "\.png$" object_is_png=png + SetEnvIf Request_URI "\.tif$" object_is_tif=tif + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + Allow from env=object_is_jpg + Allow from env=object_is_gif + Allow from env=object_is_png + Allow from env=object_is_tif + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + SetEnvIf Request_URI "\.jpg$" object_is_jpg=jpg + SetEnvIf Request_URI "\.gif$" object_is_gif=gif + SetEnvIf Request_URI "\.png$" object_is_png=png + SetEnvIf Request_URI "\.tif$" object_is_tif=tif + SetEnvIf Request_URI "\.swf$" object_is_swf=swf + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + Allow from env=object_is_jpg + Allow from env=object_is_gif + Allow from env=object_is_png + Allow from env=object_is_tif + Allow from env=object_is_swf + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + SetEnvIf Request_URI "\.jpg$" object_is_jpg=jpg + SetEnvIf Request_URI "\.gif$" object_is_gif=gif + SetEnvIf Request_URI "\.png$" object_is_png=png + SetEnvIf Request_URI "\.tif$" object_is_tif=tif + SetEnvIf Request_URI "\.swf$" object_is_swf=swf + SetEnvIf Request_URI "\.flv$" object_is_flv=flv + SetEnvIf Request_URI "\.ico$" object_is_ico=ico + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + Allow from env=object_is_jpg + Allow from env=object_is_gif + Allow from env=object_is_png + Allow from env=object_is_tif + Allow from env=object_is_swf + Allow from env=object_is_flv + Allow from env=object_is_ico + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + + + + Options -Indexes + Order deny,allow + Deny from all + + + + Options -Indexes + SetEnvIf Request_URI "\.html$" object_is_html=html + Allow from env=object_is_html + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + diff --git a/zikula.spec b/zikula.spec new file mode 100644 index 0000000..4aba1c8 --- /dev/null +++ b/zikula.spec @@ -0,0 +1,142 @@ +Name: zikula +Version: 1.1.1 +Release: 12%{?dist} +Summary: Zikula is a free open source Web Application Framework +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 +#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 +#Patch is recorded in ticket 901 on the zikula trac instance +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: httpd +Requires: php >= 5.2.0 +Requires: php-mysql >= 5.2.0 +Requires: php-pgsql >= 5.2.0 +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. \ +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 || : + +%prep +%setup -c -qn %{name}-%{version} +%patch -p0 + +%build +#nothing really for this section but rpmbuild complains if build is empty + +%install +rm -rf %{buildroot} +%{__mkdir} -p %{buildroot}/%{_datadir}/%{name} +%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name} +%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name} +%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ + +cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name} +install -m 0644 *php robots.txt %{buildroot}/%{_datadir}/%{name} + + +cp -pr pnTemp -t %{buildroot}/%{_localstatedir}/lib/%{name} +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 + + +rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess + +#changinng encoding +iconv -f ISO-8859-1 -t UTF-8 --output %{_builddir}/%{name}-%{version}/docs/previouscredits.txt %{_builddir}/%{name}-%{version}/docs/previouscredits.txt +iconv -f ISO-8859-1 -t UTF-8 --output %{_builddir}/%{name}-%{version}/docs/CREDITS.txt %{_builddir}/%{name}-%{version}/docs/CREDITS.txt + +cd %{buildroot} +cd - +#Making script executable to stop rpmlint from complaining +chmod 0755 %{buildroot}/%{_datadir}/%{name}/javascript/phplayersmenu/CHANGE_TEMPLATE_CLASS_NAME.sh +#Getting rid of zerolength files +find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \; + +#Purging .htaccess files +find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \; +%clean +rm -rf %{buildroot} + +%files + +%defattr(-,root,root,-) +%doc docs/* +%{_datadir}/%{name} +%attr(-,apache,apache) %{_localstatedir}/lib/%{name} +%config(noreplace) %{_sysconfdir}/httpd/conf.d/zikula.conf +%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/config.php + + +%post +ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || : +symlinks -crs /usr/share/zikula || : + +%changelog +* Sat Mar 14 2009 David Nalley 1.1.1-12 +- appended zero exit snippet to all pre and post lines + +* Fri Mar 13 2009 Clint Savage 1.1.1-11 +- added an additional selinux call to modify the context when the +- selinux context already exists + +* Sun Mar 8 2009 David Nalley 1.1.1-10 +- moved selinux stuff to pre rather than post + +* Sun Mar 1 2009 David Nalley 1.1.1-9 +- reverted earlier SElinux issues and used semanage to make it persistent +- added symlink to /usr/share/docs for license and contributors to show up +- changed symlinks command to recurse over enter _datadir + +* Sun Mar 1 2009 David Nalley 1.1.1-8 +- fixed another SELinux issues pointed out by herlo + +* Sun Mar 1 2009 David Nalley 1.1.1-7 +- fixed SElinux context problem pointed out by herlo + +* Sat Feb 28 2009 David Nalley 1.1.1-6 +- removed most install lines, replaced with cp -r +- fixed permissions on config file +- fixed permissions on pntemp dir + +* Sat Feb 21 2009 David Nalley 1.1.1-5 +- fixed install issues. + +* Sat Feb 21 2009 David Nalley 1.1.1-4 +- changed perms + +* Sat Feb 21 2009 David Nalley 1.1.1-3 +- Fixing dangling symlink + +* Tue Feb 17 2009 David Nalley 1.1.1-2 +- Fixed iconv issues and symlinks + +* Sun Feb 09 2009 Clint Savage 1.1.1-1 +- Fixed some minor packaging issues. + +* Wed Jan 28 2009 David Nalley 1.1.0-4 +- Changed license to GPLv2+ + +* Mon Jan 26 2009 Lukas Hetzenecker 1.1.0-3 +- Move the pnTemp directory to /var/lib/zikula/pnTemp + +* Mon Jan 26 2009 Lukas Hetzenecker 1.1.0-1 +- Initial Spec file creation for Fedora From 23bb103054c33a21633f33f36feb01ab38914022 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:52 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6ca8b0f..fbf6e2a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula -# $Id$ +# $Id: Makefile,v 1.1 2009/03/20 02:52:38 kevin Exp $ NAME := zikula SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 207603fb0d14d8d499705074e99ca0fedd6ebb76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:53 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fbf6e2a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula -# $Id: Makefile,v 1.1 2009/03/20 02:52:38 kevin Exp $ -NAME := zikula -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 diff --git a/import.log b/import.log deleted file mode 100644 index dc57bf0..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-1_1_1-12_fc10:F-9:zikula-1.1.1-12.fc10.src.rpm:1237565053