From 4544c10a8d2bd978f578c5c65e0cdb927bf345f0 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: Tue, 22 Sep 2009 02:07:46 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for xls2csv --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 8c40be29dab0faa5e5e9174648430a23708e6393 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Thu, 24 Sep 2009 19:32:49 +0000 Subject: [PATCH 2/4] Initial import xls2csv int Fedora --- .cvsignore | 1 + import.log | 1 + sources | 1 + xls2csv.spec | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 import.log create mode 100644 xls2csv.spec diff --git a/.cvsignore b/.cvsignore index e69de29..4a50d9c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xls2csv-1.06.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..8387be9 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xls2csv-1_06-5_fc11:F-10:xls2csv-1.06-5.fc11.src.rpm:1253820601 diff --git a/sources b/sources index e69de29..3114c3b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0ed77bd4dd2f9d15fa0b8dc0ad0a0480 xls2csv-1.06.tar.gz diff --git a/xls2csv.spec b/xls2csv.spec new file mode 100644 index 0000000..5a9d6aa --- /dev/null +++ b/xls2csv.spec @@ -0,0 +1,91 @@ +Name: xls2csv +Version: 1.06 +Release: 5%{?dist} +Summary: A script that recodes a spreadsheet's charset and saves as CSV + +Group: Applications/Text +License: GPL+ or Artistic +URL: http://search.cpan.org/dist/xls2csv/ +Source0: http://search.cpan.org/CPAN/authors/id/K/KE/KEN/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) perl(Test::Harness) +BuildRequires: perl(Test::Simple) perl(Unicode::Map) +BuildRequires: perl perl(Locale::Recode) perl(Text::CSV_XS) perl(Spreadsheet::ParseExcel) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Unicode::Map) + +%description +This script will recode a spreadsheet into a different character set +and output the recoded data as a csv file. + +The script came about after many headaches from dealing with Excel +spreadsheets from clients that were being received in various character +sets. + + +%prep +%setup -q + +%build +%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}" +%{__make} OPTIMIZE="$RPM_OPT_FLAGS" + +%check +%{__make} test + +%install +%{__rm} -rf %{buildroot} +%{__make} pure_install DESTDIR=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' +%{__chmod} -R u+w %{buildroot}/* + +# To avoid name conflict with catdoc package. +%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/convert%{name} +%{__gzip} -c9 %{buildroot}%{_mandir}/man1/%{name}.1 > %{buildroot}%{_mandir}/man1/convert%{name}.1.gz +%{__rm} %{buildroot}%{_mandir}/man1/%{name}.1 + + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc +%attr(0755, root, root) %{_bindir}/convert%{name} +%{_mandir}/man1/convert%{name}.1.gz + +%changelog +* Thu Sep 24 2009 Pavel Alexeev - 1.06-5 +- Rename /usr/bin/xls2csv to /usr/bin/convertxls2csv to avoid name conflict with package catdoc (Thank you Jan Klepek) + +* Mon Aug 10 2009 Pavel Alexeev - 1.06-4 +- License tag changed to "GPL+ or Artistic" + +* Sun Aug 9 2009 Pavel Alexeev - 1.06-3 +- Rewrite all BR from perl-Unicode-Map form to "perl(Unicode::Map)" +- Add back Requires: perl(:MODULE_COMPAT_%%(eval "`%%{__perl} -V:version`"; echo $version)), perl(Unicode::Map) + +* Fri Aug 7 2009 Pavel Alexeev - 1.06-2 +- Delete %%{buildroot} from PREFIX and accordingly my doubleprefix hack. +- Replace all $RPM_BUILD_ROOT by %%{buildroot} for consistency use macroses. +- Replace chmod by %%{__chmod}. +- Remove all explicit perl and perl-modules requires. + +* Sat Nov 22 2008 Pavel Alexeev - 1.06-1 +- Small cosmetics changes like use %%{__rm} instead of plain "rm" and add + braces in all macroses as it want Jason Tibbitts in BZ review 458866 +- Remove file %%{perl_vendorarch}/auto/xls2csv/.packlist and add 3 lines + (delete .packlist, delete empty directories and change permissions) + from /etc/rpmdevtools/spectemplate-perl.spec (Jason Tibbitts) + +* Tue Aug 12 2008 Pavel Alexeev - 1.06-0 +- Change BuildArch to noarch +- Add BR: perl(Test::Simple) +- Add BuildRequires: perl perl-libintl perl-Text-CSV_XS perl-Spreadsheet-ParseExcel perl-Unicode-Map for tests + +* Fri Aug 8 2008 Pavel Alexeev - 1.06-0 +- Initial spec From 692e73e1129bdb46e5169e9fd63bdf5a14ee8217 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:05 +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 e1887dc..bf32123 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xls2csv -# $Id$ +# $Id: Makefile,v 1.1 2009/09/22 02:07:44 tibbs Exp $ NAME := xls2csv 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 30a5e30421e2798ef4bfe2db3dc7b6f66d6627a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:02 +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 bf32123..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xls2csv -# $Id: Makefile,v 1.1 2009/09/22 02:07:44 tibbs Exp $ -NAME := xls2csv -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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 8387be9..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xls2csv-1_06-5_fc11:F-10:xls2csv-1.06-5.fc11.src.rpm:1253820601