From 3727ee5e03738e62b0d59eac599ce33fcab977a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Fri, 10 Jul 2009 03:42:50 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for zikula-module-crpTag --- 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 7d1165aff98deba44ab5fa25db9069947fc13b8d Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Fri, 10 Jul 2009 04:08:57 +0000 Subject: [PATCH 2/4] Commit branches F-10 and F-11 --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-module-crpTag.spec | 56 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 import.log create mode 100644 zikula-module-crpTag.spec diff --git a/.cvsignore b/.cvsignore index e69de29..448f016 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +crpTag_0.1.3.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..eb38f2c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-crpTag-0_1_3-3:F-11:zikula-module-crpTag-0.1.3-3.src.rpm:1247198873 diff --git a/sources b/sources index e69de29..c03df3f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +51ff4ac0f569e144e07cd886ec0f1fd0 crpTag_0.1.3.zip diff --git a/zikula-module-crpTag.spec b/zikula-module-crpTag.spec new file mode 100644 index 0000000..27ebb73 --- /dev/null +++ b/zikula-module-crpTag.spec @@ -0,0 +1,56 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname crpTag + +Name: zikula-module-%{zikula_modname} +Version: 0.1.3 +Release: 3%{?dist} +Summary: Simple Zikula component for tagging items, based on hooks + +Group: Applications/Publishing +License: LGPLv2+ +URL: http://code.zikula.org/crptag +# http://code.zikula.org/crptag/changeset/114/tags/crpTag_0.1.3?old_path=%2F&format=zip +Source0: %{zikula_modname}_%{version}.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +#BuildRequires: +Requires: zikula + +%description +crpTag is a simple Zikula component for tagging items, based on hooks. + + +%prep +%setup -qn tags/%{zikula_modname}_%{version} +# Remove empty index.html and others +find -size 0 | xargs rm -f + + +%build + + +%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 +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Mon Jun 22 2009 Eric "Sparks" Christensen - 0.1.3-3 +- Corrected license +* Sun Jun 14 2009 Eric "Sparks" Christensen - 0.1.3-2 +- Corrected spaces and tab mixed use in SPEC +* Sun Jun 14 2009 Fedora Docs Team - 0.1.3-1 +- Initial RPM release From 3d6989973a2feba7c0d82b7b3c868795291b94bc 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 92c4817..35d2a95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula-module-crpTag -# $Id$ +# $Id: Makefile,v 1.1 2009/07/10 03:42:47 tibbs Exp $ NAME := zikula-module-crpTag 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 6b32cd8559fd159c538114d402a803f34cd0a922 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:32 +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 35d2a95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-crpTag -# $Id: Makefile,v 1.1 2009/07/10 03:42:47 tibbs Exp $ -NAME := zikula-module-crpTag -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 eb38f2c..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-crpTag-0_1_3-3:F-11:zikula-module-crpTag-0.1.3-3.src.rpm:1247198873