Author: qboosh Date: Tue Apr 13 05:34:47 2010 GMT Module: packages Tag: HEAD ---- Log message: - libpng patch - don't disable static - python dir fix
---- Files affected: packages/libkate: libkate.spec (1.1 -> 1.2) , libkate-libpng.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/libkate/libkate.spec diff -u packages/libkate/libkate.spec:1.1 packages/libkate/libkate.spec:1.2 --- packages/libkate/libkate.spec:1.1 Mon Apr 12 08:43:42 2010 +++ packages/libkate/libkate.spec Tue Apr 13 07:34:41 2010 @@ -1,15 +1,14 @@ # $Revision$, $Date$ -# TODO -# - png 1.4 fix Summary: Libraries to handle the Kate bitstream format Name: libkate Version: 0.3.7 Release: 0.1 License: BSD Group: Libraries -URL: http://code.google.com/p/libkate/ Source0: http://libkate.googlecode.com/files/%{name}-%{version}.tar.gz # Source0-md5: e5c287b4f40498e5bde48c0a52225292 +Patch0: %{name}-libpng.patch +URL: http://code.google.com/p/libkate/ BuildRequires: bison BuildRequires: doxygen BuildRequires: flex @@ -58,6 +57,7 @@ %prep %setup -q +%patch0 -p1 # We regenerate theses files at built step rm tools/kate_parser.{c,h} @@ -65,7 +65,6 @@ %build %configure \ - --disable-static \ --docdir=%{_docdir}/%{name}-%{version} %{__make} @@ -76,8 +75,6 @@ DESTDIR=$RPM_BUILD_ROOT \ INSTALL="install -p" -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - # Fix for header timestramps touch -r $RPM_BUILD_ROOT%{_includedir}/kate/kate_config.h $RPM_BUILD_ROOT%{_includedir}/kate/kate.h @@ -112,11 +109,11 @@ %attr(755,root,root) %{_bindir}/katedec %attr(755,root,root) %{_bindir}/kateenc # XXX files fix -%{py_sitedir}/kdj -%{_mandir}/man1/KateDJ.* -%{_mandir}/man1/katalyzer.* -%{_mandir}/man1/katedec.* -%{_mandir}/man1/kateenc.* +%{py_sitescriptdir}/kdj +%{_mandir}/man1/KateDJ.1* +%{_mandir}/man1/katalyzer.1* +%{_mandir}/man1/katedec.1* +%{_mandir}/man1/kateenc.1* %files docs %defattr(644,root,root,755) @@ -128,5 +125,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2010/04/13 05:34:41 qboosh +- libpng patch +- don't disable static +- python dir fix + Revision 1.1 2010/04/12 06:43:42 glen - init from fc spec ================================================================ Index: packages/libkate/libkate-libpng.patch diff -u /dev/null packages/libkate/libkate-libpng.patch:1.1 --- /dev/null Tue Apr 13 07:34:47 2010 +++ packages/libkate/libkate-libpng.patch Tue Apr 13 07:34:41 2010 @@ -0,0 +1,36 @@ +--- libkate-0.3.7/tools/kpng.c.orig 2008-11-18 21:57:56.000000000 +0100 ++++ libkate-0.3.7/tools/kpng.c 2010-04-13 07:20:19.824993086 +0200 +@@ -179,13 +179,13 @@ + } + } + +- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr,&info_ptr,NULL); + fclose(f); + + return 0; + + error: +- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); ++ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); + if (f) fclose(f); + return -1; + } +@@ -224,7 +224,7 @@ + if (w) *w=png_get_image_width(png_ptr,info_ptr); + if (h) *h=png_get_image_height(png_ptr,info_ptr); + +- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr,&info_ptr,NULL); + + /* now read the whole file as a binary blob */ + fseek(f,0,SEEK_END); +@@ -246,7 +246,7 @@ + return 0; + + error: +- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); ++ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); + if (f) fclose(f); + return -1; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libkate/libkate.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
