Changes of Revision 5
| [-] | Added | recode.spec |
|
x 1 2 +Summary: Conversion between character sets and surfaces3 +Name: recode4 +Version: 3.65 +Release: 22%{?dist}6 +License: GPL7 +Group: Applications/File8 +Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz9 +Patch0: recode.patch10 +Patch1: recode-3.6-getcwd.patch11 +Url: http://recode.progiciels-bpi.ca/12 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)13 +14 +Requires(post): /sbin/install-info15 +Requires(post): /sbin/ldconfig16 +Requires(preun): /sbin/install-info17 +Requires(postun): /sbin/ldconfig18 +19 +20 +%description21 +The `recode' converts files between character sets and usages.22 +It recognises or produces nearly 150 different character sets23 +and is able to transliterate files between almost any pair. When exact24 +transliteration are not possible, it may get rid of the offending25 +characters or fall back on approximations. Most RFC 1345 character sets26 +are supported.27 +28 +%package devel29 +Summary: Header files and static libraries for development using recode30 +Group: Development/Libraries31 +Requires: %{name} = %{version}-%{release}32 +33 +%description devel34 +The `recode' library converts files between character sets and usages.35 +The library recognises or produces nearly 150 different character sets36 +and is able to transliterate files between almost any pair. When exact37 +transliteration are not possible, it may get rid of the offending38 +characters or fall back on approximations. Most RFC 1345 character sets39 +are supported.40 +41 +%prep42 +%setup -q43 +%patch0 -p144 +%patch1 -p1 -b .getcwd45 +46 +%build47 +%configure --disable-static48 +make %{?_smp_mflags}49 +50 +%install51 +rm -rf $RPM_BUILD_ROOT52 +53 +%makeinstall54 +%find_lang %{name}55 +56 +# remove unpackaged file from the buildroot57 +rm -f $RPM_BUILD_ROOT%{_infodir}/dir58 +59 +# remove libtool archives60 +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la61 +62 +63 +%post64 +/sbin/ldconfig65 +/sbin/install-info %{_infodir}/recode.info.gz %{_infodir}/dir --entry="* recode: (recode). Conversion between character sets and surfaces." || :66 +67 +%preun68 +if [ $1 = 0 ]; then69 + /sbin/install-info --delete %{_infodir}/recode.info.gz %{_infodir}/dir --entry="* recode: (recode). Conversion between character sets and surfaces." || :70 +fi71 +72 +%postun -p /sbin/ldconfig73 +74 +%clean75 +rm -rf $RPM_BUILD_ROOT76 +77 +%files -f %{name}.lang78 +%defattr(-,root,root)79 +%doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO80 +%{_mandir}/*/*81 +%{_infodir}/recode.info*82 +%{_bindir}/*83 +%{_libdir}/*.so.0*84 +85 +%files devel86 +%defattr(-,root,root)87 +%{_libdir}/*.so88 +%{_includedir}/*89 +90 +%changelog91 +* Fri Sep 01 2006 Zoltan Kota <z.kota[AT]gmx.net> 3.6-2292 +- rebuild93 +94 +* Mon Feb 13 2006 Zoltan Kota <z.kota[AT]gmx.net> 3.6-2195 +- rebuild96 +97 +* Thu Dec 22 2005 Zoltan Kota <z.kota[AT]gmx.net> 3.6-2098 +- rebuild99 +100 +* Fri Aug 26 2005 Zoltan Kota <z.kota[AT]gmx.net> 3.6-19101 +- fix requires102 +- disable static libs and remove libtool archives103 +- add %%doc104 +105 +* Fri Aug 26 2005 Zoltan Kota <z.kota[AT]gmx.net> 3.6-18106 +- add dist tag107 +- specfile cleanup108 +109 +* Thu May 26 2005 Bill Nottingham <notting@redhat.com> 3.6-17110 +- rebuild for Extras111 +112 +* Mon Mar 07 2005 Than Ngo <than@redhat.com> 3.6-16113 +- cleanup114 +115 +* Sat Mar 05 2005 Than Ngo <than@redhat.com> 3.6-15116 +- rebuilt117 +118 +* Wed Feb 09 2005 Than Ngo <than@redhat.com> 3.6-14119 +- rebuilt120 +121 +* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>122 +- rebuilt123 +124 +* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>125 +- rebuilt126 +127 +* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>128 +- rebuilt129 +130 +* Fri Feb 13 2004 Than Ngo <than@redhat.com> 3.6-11 131 +- add a patch file from kota@szbk.u-szeged.hu (bug #115524)132 +133 +* Thu Nov 20 2003 Thomas Woerner <twoerner@redhat.com> 3.6-10134 +- Fixed RPATH (missing make in %%build)135 +136 +* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>137 +- rebuilt138 +139 +* Wed Jan 22 2003 Tim Powers <timp@redhat.com>140 +- rebuilt141 +142 +* Wed Dec 11 2002 Tim Powers <timp@redhat.com> 3.6-7143 +- rebuild on all arches144 +- remove unpackaged file from the buildroot145 +146 +* Fri Jun 21 2002 Tim Powers <timp@redhat.com>147 +- automated rebuild148 +149 +* Thu May 23 2002 Tim Powers <timp@redhat.com>150 +- automated rebuild151 +152 +* Mon Apr 15 2002 Bill Nottingham <notting@redhat.com> 3.6-4153 +- add ldconfig %post/%postun154 +155 +* Tue Feb 26 2002 Than Ngo <than@redhat.com> 3.6-3156 +- rebuild157 +158 +* Wed Jan 09 2002 Tim Powers <timp@redhat.com>159 +- automated rebuild160 +161 +* Tue Nov 13 2001 Than Ngo <than@redhat.com> 3.6-1162 +- initial RPM for 8.0163 |
||
| [+] | Added | recode-3.6-getcwd.patch ^ |
| @@ -0,0 +1,11 @@ +--- recode-3.6/lib/gettext.c.orig 2005-03-07 12:18:30.000000000 +0100 ++++ recode-3.6/lib/gettext.c 2005-03-07 12:23:14.000000000 +0100 +@@ -1668,8 +1668,6 @@ + # if !defined HAVE_GETCWD + char *getwd (); + # define getcwd(buf, max) getwd (buf) +-# else +-char *getcwd (); + # endif + # ifndef HAVE_STPCPY + static char *stpcpy PARAMS ((char *dest, const char *src)); | ||
| [+] | Added | recode.patch ^ |
| @@ -0,0 +1,68 @@ +--- recode-3.6.orig/src/libiconv.c ++++ recode-3.6/src/libiconv.c +@@ -1,5 +1,5 @@ + /* Conversion of files between different charsets and surfaces. +- Copyright © 1999, 2000 Free Software Foundation, Inc. ++ Copyright © 1999, 2000, 2001 Free Software Foundation, Inc. + Contributed by François Pinard <pinard@iro.umontreal.ca>, 1999, + and Bruno Haible <haible@clisp.cons.org>, 2000. + +@@ -195,12 +195,17 @@ + memcpy() doesn't do here, because the regions might overlap. + memmove() isn't worth it, because we rarely have to move more + than 12 bytes. */ +- if (input > input_buffer && input_left > 0) ++ cursor = input_buffer; ++ if (input_left > 0) + { +- cursor = input_buffer; +- do +- *cursor++ = *input++; +- while (--input_left > 0); ++ if (input > input_buffer) ++ { ++ do ++ *cursor++ = *input++; ++ while (--input_left > 0); ++ } ++ else ++ cursor += input_left; + } + } + +--- recode-3.6.orig/src/request.c ++++ recode-3.6/src/request.c +@@ -1073,7 +1073,7 @@ + if (task->output.cursor + 4 >= task->output.limit) + { + RECODE_OUTER outer = task->request->outer; +- size_t old_size = task->output.limit - task->output.buffer; ++ size_t old_size = task->output.cursor - task->output.buffer; + size_t new_size = task->output.cursor + 4 - task->output.buffer; + + /* FIXME: Rethink about how the error should be reported. */ +--- recode-3.6.orig/src/task.c ++++ recode-3.6/src/task.c +@@ -1198,6 +1198,8 @@ + else + success = transform_mere_copy (subtask); + ++ task->output = subtask->output; ++ + if (subtask->input.name && *subtask->input.name) + fclose (subtask->input.file); + if (subtask->output.name && *subtask->output.name) +--- recode-3.6.orig/src/hash.h ++++ recode-3.6/src/hash.h +@@ -21,6 +21,11 @@ + /* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use + obstacks instead of malloc, and recompile `hash.c' with same setting. */ + ++#define hash_lookup recode_hash_lookup ++#define hash_delete recode_hash_delete ++#define hash_free recode_hash_free ++#define hash_insert recode_hash_insert ++ + #ifndef PARAMS + # if PROTOTYPES || __STDC__ + # define PARAMS(Args) Args | ||
| Added | recode-3.6-22.el5.centos.src.rpm ^ | |
| Added | recode-3.6.tar.gz ^ | |