From 1a359b9d675a90802031b6d31f13727db12ef75b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 7 Dec 2009 05:17:11 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for zikula-module-menutree --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 5b791b87a9fba6711828630d27f71e17350fc337 Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Mon, 7 Dec 2009 13:29:47 +0000 Subject: [PATCH 2/4] Initial build of menutree for F12. --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-module-menutree.spec | 67 +++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 import.log create mode 100644 zikula-module-menutree.spec diff --git a/.cvsignore b/.cvsignore index e69de29..7e36f48 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +tags_menutree_2.2-r192.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..e461f66 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-menutree-2_2-1_fc12:F-12:zikula-module-menutree-2.2-1.fc12.src.rpm:1260192566 diff --git a/sources b/sources index e69de29..b745213 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +72f19c4d95d935e29e54a8ecb1f8e795 tags_menutree_2.2-r192.zip diff --git a/zikula-module-menutree.spec b/zikula-module-menutree.spec new file mode 100644 index 0000000..117ae29 --- /dev/null +++ b/zikula-module-menutree.spec @@ -0,0 +1,67 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname menutree + +Name: zikula-module-%{zikula_modname} +Version: 2.2 +Release: 1%{?dist} +Summary: Menutree allows to create multilevel, hierarchical (tree-like) menu + +Group: Applications/Publishing +License: GPL+ and ASL 2.0 +# The only file that is licensed under ASL2 is cookiejar.js. All other is GPL+. +URL: http://code.zikula.org/bianor/changeset/192/tags/menutree/ +# http://code.zikula.org/bianor/changeset/192/tags/menutree/2.2?old_path=%2F&format=zip +Source0: tags_%{zikula_modname}_%{version}-r192.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: dos2unix +Requires: zikula >= 1.2 + +%description +Menutree allows to create multilevel, hierarchical (tree-like) menu. +Block management can be done through "drag and drop" method, and the +whole process of creating a block can be done without page reloads. + + +%prep +%setup -qn tags/%{zikula_modname}/%{version}/modules/menutree +# Remove empty index.html and others +find -size 0 | xargs rm -f +find -name '.htaccess' | xargs rm -f +find pndocs/ -name '*.txt' | xargs dos2unix +iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/credits.txt +iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/pomoc.txt + +%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 pndocs/help.txt pndocs/pomoc.txt pndocs/readme.txt +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Sun Dec 06 2009 Eric "Sparks" Christensen - 2.2-1 +- Upstream fix of license issues. + +* Wed Jul 15 2009 Eric "Sparks" Christensen - 2.0.1-2 +- Fixed source0 name. + +* Sun Jun 14 2009 Fedora Docs Team - 2.0.1-1 +- Initial RPM release + From 55d5c12ebcb69ec21488bada0ecf01340f484fd7 Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Wed, 9 Jun 2010 16:25:54 +0000 Subject: [PATCH 3/4] - Conversion to gettext - New dynamic elements: adminlinks and pagesetter --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- zikula-module-menutree.spec | 15 ++++++++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7e36f48..3b2de70 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tags_menutree_2.2-r192.zip +module_menutree_2-3.zip diff --git a/import.log b/import.log index e461f66..3320fb9 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ zikula-module-menutree-2_2-1_fc12:F-12:zikula-module-menutree-2.2-1.fc12.src.rpm:1260192566 +zikula-module-menutree-2_3-1_fc13:F-12:zikula-module-menutree-2.3-1.fc13.src.rpm:1276100678 diff --git a/sources b/sources index b745213..71da770 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72f19c4d95d935e29e54a8ecb1f8e795 tags_menutree_2.2-r192.zip +d499630f98f58b9d12a29f0e1503f861 module_menutree_2-3.zip diff --git a/zikula-module-menutree.spec b/zikula-module-menutree.spec index 117ae29..8579903 100644 --- a/zikula-module-menutree.spec +++ b/zikula-module-menutree.spec @@ -3,7 +3,7 @@ %global zikula_modname menutree Name: zikula-module-%{zikula_modname} -Version: 2.2 +Version: 2.3 Release: 1%{?dist} Summary: Menutree allows to create multilevel, hierarchical (tree-like) menu @@ -11,12 +11,11 @@ Group: Applications/Publishing License: GPL+ and ASL 2.0 # The only file that is licensed under ASL2 is cookiejar.js. All other is GPL+. URL: http://code.zikula.org/bianor/changeset/192/tags/menutree/ -# http://code.zikula.org/bianor/changeset/192/tags/menutree/2.2?old_path=%2F&format=zip -Source0: tags_%{zikula_modname}_%{version}-r192.zip +Source0: http://community.zikula.org/extensionsDist/module_menutree_2-3.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: dos2unix -Requires: zikula >= 1.2 +Requires: zikula >= 1.2.2 %description Menutree allows to create multilevel, hierarchical (tree-like) menu. @@ -25,13 +24,15 @@ whole process of creating a block can be done without page reloads. %prep -%setup -qn tags/%{zikula_modname}/%{version}/modules/menutree +#% setup -qn tags/% {zikula_modname}/% {version}/modules/menutree +%setup -qn modules/menutree # Remove empty index.html and others find -size 0 | xargs rm -f find -name '.htaccess' | xargs rm -f find pndocs/ -name '*.txt' | xargs dos2unix iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/credits.txt iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/pomoc.txt +rm -r locale/* %build @@ -56,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 9 2010 Eric "Sparks" Christensen - 2.3-1 +- Conversion to gettext +- New dynamic elements: adminlinks and pagesetter + * Sun Dec 06 2009 Eric "Sparks" Christensen - 2.2-1 - Upstream fix of license issues. From cda7ee50c8a0b64fcec08b5ce7ac3cfc6df3bcfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:46 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 4 files changed, 24 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 964dc54..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-menutree -# $Id$ -NAME := zikula-module-menutree -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 3320fb9..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -zikula-module-menutree-2_2-1_fc12:F-12:zikula-module-menutree-2.2-1.fc12.src.rpm:1260192566 -zikula-module-menutree-2_3-1_fc13:F-12:zikula-module-menutree-2.3-1.fc13.src.rpm:1276100678