rpms/perl-Unicode-Map8/EL-4 perl-Unicode-Map8-0.12-declaration.patch, NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE, 1.1 perl-Unicode-Map8.spec, 1.4, 1.5

Thu Dec 6 17:09:36 UTC 2007

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Unicode-Map8/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11441/EL-4

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
Cleanups for first EPEL versions

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-Map8/EL-4/perl-Unicode-Map8.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-Map8.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-Map8.spec	6 Dec 2007 17:08:58 -0000	1.5
@@ -1,18 +1,19 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        4
-Epoch:          0
+Release:        15%{?dist}
+
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
-Source0:      http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-%{version}.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl(Unicode::String)
+BuildRequires:  perl(ExtUtils::MakeMaker), perl(Unicode::String)
+
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -25,25 +26,28 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
-
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
+for f in Changes README; do
+  iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
+  mv ${f}.utf8 ${f}
+done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,12 +59,51 @@
 %defattr(-,root,root,-)
 %doc Changes README
 %{_bindir}/umap
-%{perl_vendorarch}/auto/Unicode
-%{perl_vendorarch}/Unicode
-%{_mandir}/man[13]/*.[13]*
+%{perl_vendorarch}/auto/Unicode/
+%{perl_vendorarch}/Unicode/
+%{_mandir}/man1/umap.1*
+%{_mandir}/man3/Unicode::Map8.3pm*
 
 
 %changelog
+* Thu Dec  6 2007 Paul Howarth <paul at city-fan.org> 0.12-15
+- simplify package build in line with perl spec template
+- no need to define %%{perl_vendorarch}
+- refactor buildreqs to support build on EL4/5
+- more specific %%files list
+- use %%{version} macro in source URL
+- re-encode Changes and README as UTF8
+
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-14
+- fix license tag again (thanks Tom)
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-13
+- fix license tag (like perl itself)
+
+* Mon Aug 13 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-12
+- BR: perl-devel
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
+- rebuild
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.12-8
+- ExcludeArch x86_64
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.12-7
+- disable unit tests (map8.t fails on x86_64)
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.12-6
+- rebuild for FC5
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Mon Feb  2 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.12-0.fdr.4
 - Reduce directory ownership bloat.
 


