From 75a5dfe7eb4fad7b9de04517982d83dd272e00b6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 19 Jul 2009 20:50:37 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for zikula-module-News --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 14d298b3eea976f0221177287ef4279fc820bca1 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Tue, 21 Jul 2009 22:03:58 +0000 Subject: [PATCH 2/5] Add F-11 branch files --- zikula-module-News.spec | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 zikula-module-News.spec diff --git a/zikula-module-News.spec b/zikula-module-News.spec new file mode 100644 index 0000000..f35eefa --- /dev/null +++ b/zikula-module-News.spec @@ -0,0 +1,60 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname News + +Name: zikula-module-%{zikula_modname} +Version: 2.4.1 +Release: 2%{?dist} +Summary: Manages news articles on your Zikula site + +Group: Applications/Publishing +License: GPL+ +URL: http://code.zikula.org/news +# http://code.zikula.org/news/changeset/167/tags/News-2.4.1?old_path=%2F&format=zip +Source0: %{zikula_modname}_%{version}.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: dos2unix +Requires: zikula + +%description +News module to manage news articles on your site. Provides +multi-categorization, scheduled publishing, the basic management +features and includes some highly customizable blocks and plugins for +the Content module. + +%prep +%setup -qn tags/%{zikula_modname}-%{version} +# Remove empty index.html and others +find -size 0 | xargs rm -f +dos2unix modules/News/pndocs/NewsTODO.txt + + +%build + + +%install +rm -rf $RPM_BUILD_ROOT +%{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} +pushd modules/%{zikula_modname} +cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} +popd +rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc modules/News/pndocs/NewsTODO.txt modules/News/pndocs/tour_page1.htm +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Thu Jul 16 2009 Paul W. Frields - 2.4.1-2 +- Fix packaging errors + +* Sun Jun 14 2009 Fedora Docs Team - 2.4.1-1 +- Initial RPM release From 5d563943acc318b018d2145d2198cd600cf9f939 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Wed, 22 Jul 2009 20:14:02 +0000 Subject: [PATCH 3/5] Update source lists --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index e69de29..0cd48cd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +News_2.4.1.zip diff --git a/sources b/sources index e69de29..79fc390 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +cac873b9b459d64b9aaceeeea9a8a136 News_2.4.1.zip From 24dfceeb0093482bf7a02875d0da776d32c2b8df Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:53 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 69829fb..00e81b1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := zikula-module-News 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 28a901a4e1d86834170cfb6d958c95e32f972ab3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:08 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 00e81b1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-News -# $Id$ -NAME := zikula-module-News -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11