From a56bf60f86f110981506993ca6628a159774cf62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Wed, 21 Oct 2009 19:58:31 +0000 Subject: [PATCH 1/5] Initial commit --- .cvsignore | 1 + import.log | 1 + pagemaster-separate-filterutil.patch | 13 +++++ sources | 1 + zikula-module-pagemaster.spec | 74 ++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 import.log create mode 100644 pagemaster-separate-filterutil.patch create mode 100644 zikula-module-pagemaster.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fa072c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +package_ba269f9bbdba5234dca4bbed95702be2.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..c3a8db8 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-pagemaster-0_3_1-3_fc11:HEAD:zikula-module-pagemaster-0.3.1-3.fc11.src.rpm:1256154836 diff --git a/pagemaster-separate-filterutil.patch b/pagemaster-separate-filterutil.patch new file mode 100644 index 0000000..8f70e2f --- /dev/null +++ b/pagemaster-separate-filterutil.patch @@ -0,0 +1,13 @@ +Index: modules/pagemaster/pnuserapi.php +=================================================================== +--- modules.orig/pagemaster/pnuserapi.php ++++ modules/pagemaster/pnuserapi.php +@@ -303,7 +303,7 @@ function pagemaster_userapi_pubList($arg + if (version_compare(PN_VERSION_NUM, '2.0', '>=')) + Loader::LoadClass("FilterUtil"); + else +- Loader::LoadClass("FilterUtil",'modules/pagemaster/classes'); ++ Loader::LoadClass("FilterUtil",'config/classes'); + + + foreach ($pubfields as $fieldname => $field) { diff --git a/sources b/sources index e69de29..b4aa9c4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +bd3190b020698acfe6ce6d85f1909840 package_ba269f9bbdba5234dca4bbed95702be2.zip diff --git a/zikula-module-pagemaster.spec b/zikula-module-pagemaster.spec new file mode 100644 index 0000000..c62c2d6 --- /dev/null +++ b/zikula-module-pagemaster.spec @@ -0,0 +1,74 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname pagemaster + +Name: zikula-module-%{zikula_modname} +Version: 0.3.1 +Release: 3%{?dist} +Summary: Creates pages with dynamic content like news, articles, etc +Group: Applications/Publishing +License: GPLv2+ +URL: http://code.zikula.org/pagemaster/ +# Source URL is dynamically generated. Go to URL to fetch it +Source0: package_ba269f9bbdba5234dca4bbed95702be2.zip +Patch0: pagemaster-separate-filterutil.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: zikula + +%description +Pagemaster is a fully Zikula 1.1 compliant but non complete clone of Pagesetter +(relations and mediashare plugin are missing still). The main task of the +module is creating pages with dynamic content like news articles, product +descriptions, band listings etc. + +%prep +%setup -q -c + +%patch0 -p0 + +# Remove empty index.html and others +find -size 0 | xargs rm -f + +#Fixing wrong-file-end-of-line-encoding error +sed -i 's/\r//' modules/pagemaster/pndocs/install-and-usage.txt + +# Rpmlint warnings E: script-without-shebang +find . -name '*.php' -exec chmod 0644 '{}' \; + +# We package Filterutil in its own package in Fedora +rm -rf modules/pagemaster/classes/FilterUtil.class.php +rm -rf modules/pagemaster/classes/FilterUtil + +%build + +%install +rm -rf %{buildroot} + + +cd modules/%{zikula_modname} + +mkdir -p %{buildroot}/%{zikula_moddir}/%{zikula_modname} +cp -pr . %{buildroot}/%{zikula_moddir}/%{zikula_modname} +rm -rf %{buildroot}/%{zikula_moddir}/%{zikula_modname}/pndocs + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc modules/%{zikula_modname}/pndocs/* +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Thu Sep 17 2009 Toshio Kuratomi - 0.3.1-3 +- Update for separated FilterUtil module + +* Fri Aug 28 2009 Rahul Sundaram - 0.3.1-2 +- Fix license tag and add Source URL comment + +* Wed Aug 26 2009 Rahul Sundaram - 0.3.1-1 +- initial package +- Based on Chitlesh Goorah's spec From de82b3fa9ff241b7712cdbe30e441742dbf192bc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:19 +0000 Subject: [PATCH 2/5] 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 50f2cf7..ba9a936 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula-module-pagemaster -# $Id$ +# $Id: Makefile,v 1.1 2009/10/06 17:34:38 kevin Exp $ NAME := zikula-module-pagemaster 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 83cb8ca23bc96f51845bef9445293141fb9e5ccc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:52 +0000 Subject: [PATCH 3/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 ba9a936..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-pagemaster -# $Id: Makefile,v 1.1 2009/10/06 17:34:38 kevin Exp $ -NAME := zikula-module-pagemaster -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/import.log b/import.log deleted file mode 100644 index c3a8db8..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-pagemaster-0_3_1-3_fc11:HEAD:zikula-module-pagemaster-0.3.1-3.fc11.src.rpm:1256154836 From e781bafc22a2acbe80e0c94b75f58ff1dc06b5ee Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 03:00:39 -0600 Subject: [PATCH 4/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zikula-module-pagemaster.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zikula-module-pagemaster.spec b/zikula-module-pagemaster.spec index c62c2d6..9af0d11 100644 --- a/zikula-module-pagemaster.spec +++ b/zikula-module-pagemaster.spec @@ -4,7 +4,7 @@ Name: zikula-module-%{zikula_modname} Version: 0.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Creates pages with dynamic content like news, articles, etc Group: Applications/Publishing License: GPLv2+ @@ -63,6 +63,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Sep 17 2009 Toshio Kuratomi - 0.3.1-3 - Update for separated FilterUtil module From a2bfb392b27ad5452834dd64715e58bb09f152d2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Feb 2011 17:13:18 -0500 Subject: [PATCH 5/5] Retire zikula-module-pagemaster. --- dead.package | 1 + pagemaster-separate-filterutil.patch | 13 ----- sources | 1 - zikula-module-pagemaster.spec | 77 ---------------------------- 4 files changed, 1 insertion(+), 91 deletions(-) create mode 100644 dead.package delete mode 100644 pagemaster-separate-filterutil.patch delete mode 100644 sources delete mode 100644 zikula-module-pagemaster.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..de91ae3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired due to no active owner on 2011-02-23 diff --git a/pagemaster-separate-filterutil.patch b/pagemaster-separate-filterutil.patch deleted file mode 100644 index 8f70e2f..0000000 --- a/pagemaster-separate-filterutil.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: modules/pagemaster/pnuserapi.php -=================================================================== ---- modules.orig/pagemaster/pnuserapi.php -+++ modules/pagemaster/pnuserapi.php -@@ -303,7 +303,7 @@ function pagemaster_userapi_pubList($arg - if (version_compare(PN_VERSION_NUM, '2.0', '>=')) - Loader::LoadClass("FilterUtil"); - else -- Loader::LoadClass("FilterUtil",'modules/pagemaster/classes'); -+ Loader::LoadClass("FilterUtil",'config/classes'); - - - foreach ($pubfields as $fieldname => $field) { diff --git a/sources b/sources deleted file mode 100644 index b4aa9c4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bd3190b020698acfe6ce6d85f1909840 package_ba269f9bbdba5234dca4bbed95702be2.zip diff --git a/zikula-module-pagemaster.spec b/zikula-module-pagemaster.spec deleted file mode 100644 index 9af0d11..0000000 --- a/zikula-module-pagemaster.spec +++ /dev/null @@ -1,77 +0,0 @@ -%global zikula_base %{_datadir}/zikula -%global zikula_moddir %{zikula_base}/modules -%global zikula_modname pagemaster - -Name: zikula-module-%{zikula_modname} -Version: 0.3.1 -Release: 4%{?dist} -Summary: Creates pages with dynamic content like news, articles, etc -Group: Applications/Publishing -License: GPLv2+ -URL: http://code.zikula.org/pagemaster/ -# Source URL is dynamically generated. Go to URL to fetch it -Source0: package_ba269f9bbdba5234dca4bbed95702be2.zip -Patch0: pagemaster-separate-filterutil.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -Requires: zikula - -%description -Pagemaster is a fully Zikula 1.1 compliant but non complete clone of Pagesetter -(relations and mediashare plugin are missing still). The main task of the -module is creating pages with dynamic content like news articles, product -descriptions, band listings etc. - -%prep -%setup -q -c - -%patch0 -p0 - -# Remove empty index.html and others -find -size 0 | xargs rm -f - -#Fixing wrong-file-end-of-line-encoding error -sed -i 's/\r//' modules/pagemaster/pndocs/install-and-usage.txt - -# Rpmlint warnings E: script-without-shebang -find . -name '*.php' -exec chmod 0644 '{}' \; - -# We package Filterutil in its own package in Fedora -rm -rf modules/pagemaster/classes/FilterUtil.class.php -rm -rf modules/pagemaster/classes/FilterUtil - -%build - -%install -rm -rf %{buildroot} - - -cd modules/%{zikula_modname} - -mkdir -p %{buildroot}/%{zikula_moddir}/%{zikula_modname} -cp -pr . %{buildroot}/%{zikula_moddir}/%{zikula_modname} -rm -rf %{buildroot}/%{zikula_moddir}/%{zikula_modname}/pndocs - - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%doc modules/%{zikula_modname}/pndocs/* -%{zikula_moddir}/%{zikula_modname} - - -%changelog -* Tue Feb 08 2011 Fedora Release Engineering - 0.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Sep 17 2009 Toshio Kuratomi - 0.3.1-3 -- Update for separated FilterUtil module - -* Fri Aug 28 2009 Rahul Sundaram - 0.3.1-2 -- Fix license tag and add Source URL comment - -* Wed Aug 26 2009 Rahul Sundaram - 0.3.1-1 -- initial package -- Based on Chitlesh Goorah's spec