From 35367f97e3ad254be2d6f078ed6c28a82ec4d653 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 14 Jul 2009 04:32:37 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for zikula-module-MultiHook --- 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 bfe5edbb68e015d91043697f3f297a2c79e4ec5d Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Tue, 14 Jul 2009 12:15:08 +0000 Subject: [PATCH 2/4] Initial build for F-11 for Multihook. --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-module-MultiHook.spec | 76 ++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 import.log create mode 100644 zikula-module-MultiHook.spec diff --git a/.cvsignore b/.cvsignore index e69de29..9ab3362 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +MultiHook_5.0.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..65b1738 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-MultiHook-5_0-4_fc11:F-11:zikula-module-MultiHook-5.0-4.fc11.src.rpm:1247573683 diff --git a/sources b/sources index e69de29..26b066f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7bcef21d80df346133ce6742b9b7bbb6 MultiHook_5.0.zip diff --git a/zikula-module-MultiHook.spec b/zikula-module-MultiHook.spec new file mode 100644 index 0000000..f7d8679 --- /dev/null +++ b/zikula-module-MultiHook.spec @@ -0,0 +1,76 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname MultiHook + +Name: zikula-module-%{zikula_modname} +Version: 5.0 +Release: 4%{?dist} +Summary: MultiHook is a simple replacement for the old AutoLinks module for Zikula + +Group: Applications/Publishing +License: GPLv2+ +URL: http://code.zikula.org/multihook/ +#http://code.zikula.org/multihook/downloads/4 + +Source0: %{zikula_modname}_%{version}.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +#BuildRequires: +Requires: zikula + +%description +MultiHook started as a simple replacement for the old AutoLinks module +(replacing normal text with links), but in the meantime it can handle also +abbreviations and acronyms (replacing text with abbr and acronym-tags) and it +can also censor if wanted (replacing bad words with ***). Links, abbreviations, +acronyms and bad words can be easily defined with some helpful Ajax +functionality. MultiHook was the first module in the Zikula world to use Ajax +for convenience. + + +%prep +%setup -qn modules/%{zikula_modname} +# Remove empty index.html and others +find -size 0 | xargs rm -f + + +%build + +# Fixing wrong-file-end-of-line-encoding errors +cd pndocs +sed -i 's/\r//' license.txt +sed -i 's/\r//' install.txt +sed -i 's/\r//' needles_howto.txt +sed -i 's/\r//' credits.txt +sed -i 's/\r//' changelog.txt + +%install +rm -rf $RPM_BUILD_ROOT +%{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} +cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} +rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc pndocs/changelog.txt pndocs/license.txt pndocs/credits.txt pndocs/help.txt pndocs/install.txt pndocs/needles_howto.txt +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Mon Jul 13 2009 Eric "Sparks" Christensen - 5.0-4 +- Fixed license in SPEC. + +* Thu Jul 09 2009 Eric "Sparks" Christensen - 5.0-3 +- Fixed wrong-file-end-of-line-encoding errors + +* Sun Jun 15 2009 Eric "Sparks" Christensen - 5.0-2 +- Added docs to the SPEC +- Fixed mix of spaces and tabs in SPEC + +* Sun Jun 14 2009 Eric "Sparks" Christensen - 5.0-1 +- Initial RPM release From 448e2060a3074ececaaf45f75b238b14df1bfc91 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:53 +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 baec3cf..757380b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula-module-MultiHook -# $Id$ +# $Id: Makefile,v 1.1 2009/07/14 04:32:35 kevin Exp $ NAME := zikula-module-MultiHook 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 01215b876a0a603954b52e4e1c6b0af9975c06bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:03 +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 757380b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-MultiHook -# $Id: Makefile,v 1.1 2009/07/14 04:32:35 kevin Exp $ -NAME := zikula-module-MultiHook -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 diff --git a/import.log b/import.log deleted file mode 100644 index 65b1738..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-MultiHook-5_0-4_fc11:F-11:zikula-module-MultiHook-5.0-4.fc11.src.rpm:1247573683