From a0f5618e89dc630f9feb73cbb92e4fbfdf3e9cd5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 22 Oct 2009 04:34:42 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for zikula-module-Polls --- 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 20a66de70f0f04ed3e60d382c54d38133210ea2f Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Thu, 22 Oct 2009 23:16:09 +0000 Subject: [PATCH 2/5] New package. --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-module-Polls.spec | 61 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 import.log create mode 100644 zikula-module-Polls.spec diff --git a/.cvsignore b/.cvsignore index e69de29..bfecd40 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Polls_2_0_2.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..3af5110 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-Polls-2_0_2-3_fc11:F-12:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256253313 diff --git a/sources b/sources index e69de29..fea4f37 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +cad0cb9287ab06d935461b7e5fbbf939 Polls_2_0_2.zip diff --git a/zikula-module-Polls.spec b/zikula-module-Polls.spec new file mode 100644 index 0000000..eec5859 --- /dev/null +++ b/zikula-module-Polls.spec @@ -0,0 +1,61 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname Polls + +Name: zikula-module-%{zikula_modname} +Version: 2.0.2 +Release: 3%{?dist} +Summary: Simple voting system for Zikula + +Group: Applications/Publishing +License: GPL+ +URL: http://code.zikula.org/advancedpolls/downloads +# http://code.zikula.org/advancedpolls/downloads/3 +Source0: %{zikula_modname}_2_0_2.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +#BuildRequires: +Requires: zikula + +%description +Polls is a simple voting system for the Zikula CMS system + + +%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//' credits.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/credits.txt +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Thu Jul 23 2009 Eric "Sparks" Christensen - 2.0.2-3 +- Fixed SOURCE0 in SPEC + +* Wed Jul 15 2009 Eric "Sparks" Christensen - 2.0.2-2 +- Fixed wrong-file-end-of-line-encoding errors + +* Wed Jul 15 2009 Eric "Sparks" Christensen - 2.0.2-1 +- Initial RPM release From 67757e818817de27f3b53e52dd61dbbf3971c6f6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:53 +0000 Subject: [PATCH 3/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 27f2793..41c522c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := zikula-module-Polls 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 dffcbf99fbbb28ce8dc69099ea97a1a3d00d9866 Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Wed, 9 Jun 2010 02:31:04 +0000 Subject: [PATCH 4/5] - gettext conversion #21 - several category issues #33 - template update - fixed several minor issues #15 - fixed short url bugs #18 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- zikula-module-Polls.spec | 22 +++++++++++++++------- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index bfecd40..03f8290 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Polls_2_0_2.zip +Polls_2.1.0.zip diff --git a/import.log b/import.log index 3af5110..5a780c4 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ zikula-module-Polls-2_0_2-3_fc11:F-12:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256253313 +zikula-module-Polls-2_1_0-1_fc13:F-12:zikula-module-Polls-2.1.0-1.fc13.src.rpm:1276050369 diff --git a/sources b/sources index fea4f37..a44e06d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cad0cb9287ab06d935461b7e5fbbf939 Polls_2_0_2.zip +ac66571295eca5934eb45d28e58af8aa Polls_2.1.0.zip diff --git a/zikula-module-Polls.spec b/zikula-module-Polls.spec index eec5859..a4cbec0 100644 --- a/zikula-module-Polls.spec +++ b/zikula-module-Polls.spec @@ -3,19 +3,19 @@ %global zikula_modname Polls Name: zikula-module-%{zikula_modname} -Version: 2.0.2 -Release: 3%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Simple voting system for Zikula Group: Applications/Publishing License: GPL+ -URL: http://code.zikula.org/advancedpolls/downloads -# http://code.zikula.org/advancedpolls/downloads/3 -Source0: %{zikula_modname}_2_0_2.zip +URL: http://code.zikula.org/advancedpolls +# http://code.zikula.org/advancedpolls/downloads/4 +Source0: http://code.zikula.org/advancedpolls/downloads/Polls_2.1.0.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch #BuildRequires: -Requires: zikula +Requires: zikula >= 1.2.2 %description Polls is a simple voting system for the Zikula CMS system @@ -38,7 +38,7 @@ 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 - +rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/locale %clean rm -rf $RPM_BUILD_ROOT @@ -47,10 +47,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc pndocs/credits.txt +#% doc locale/de/LC_MESSAGES/module_polls.mo %{zikula_moddir}/%{zikula_modname} %changelog +* Wed May 05 2010 Eric "Sparks" Christensen - 2.1.0-1 +- gettext conversion #21 +- several category issues #33 +- template update +- fixed several minor issues #15 +- fixed short url bugs #18 + * Thu Jul 23 2009 Eric "Sparks" Christensen - 2.0.2-3 - Fixed SOURCE0 in SPEC From 99114cf9e2e92c0a397519383afba7d505dbf44a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:10 +0000 Subject: [PATCH 5/5] 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 41c522c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-Polls -# $Id$ -NAME := zikula-module-Polls -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 5a780c4..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -zikula-module-Polls-2_0_2-3_fc11:F-12:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256253313 -zikula-module-Polls-2_1_0-1_fc13:F-12:zikula-module-Polls-2.1.0-1.fc13.src.rpm:1276050369