Author: qboosh Date: Wed Mar 8 19:45:18 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - switched to modular xorg - killed dps coder - release 2
---- Files affected: SPECS: GraphicsMagick.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/GraphicsMagick.spec diff -u SPECS/GraphicsMagick.spec:1.1 SPECS/GraphicsMagick.spec:1.2 --- SPECS/GraphicsMagick.spec:1.1 Sun Jan 29 00:36:29 2006 +++ SPECS/GraphicsMagick.spec Wed Mar 8 20:45:13 2006 @@ -19,17 +19,16 @@ Summary(uk): đĹŇĹÇĚŃÄ, ËĎÎ×ĹŇÔŐ×ÁÎÎŃ ÔÁ ĎÂŇĎÂËÁ ÚĎÂŇÁÖĹÎŘ ĐŚÄ X Window Name: GraphicsMagick Version: 1.1.7 -Release: 1 +Release: 2 License: Apache-like Group: X11/Applications/Graphics Source0: ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/%{name}-%{version}.tar.bz2 # Source0-md5: f75d830ca623bf10385b3ad62c48437a Patch0: %{name}-libpath.patch Patch1: %{name}-system-libltdl.patch +Patch2: %{name}-link.patch URL: http://www.graphicsmagick.org/ -BuildRequires: XFree86-DPS-devel -BuildRequires: XFree86-devel -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.59-9 BuildRequires: automake >= 1:1.8 BuildRequires: bzip2-devel >= 1.0.1 BuildRequires: expat-devel >= 1.95.7 @@ -49,9 +48,11 @@ BuildRequires: libxml2-devel >= 2.0 BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: xorg-lib-libXext-devel # only checked for, but only supplied scripts/txt2html is used #BuildRequires: txt2html Requires: %{name}-libs = %{version}-%{release} +Obsoletes: GraphicsMagick-coder-dps BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # we don't want "-s" here, because it would be added to `GraphicsMagick*-config --ldflags` @@ -135,11 +136,11 @@ Summary(uk): čĹÄĹŇÉ ÔÁ ÂŚÂĚŚĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍŐ×ÁÎÎŃ Ú GraphicsMagick Group: X11/Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: XFree86-devel Requires: bzip2-devel Requires: freetype-devel Requires: lcms-devel Requires: libltdl-devel +Requires: xorg-lib-libXext-devel Requires: zlib-devel %description devel @@ -225,20 +226,6 @@ %description coder-dot -l pl Moduł kodera dla plików GraphViz DOT. -%package coder-dps -Summary: Coder module for Postscript files using DPS extension -Summary(pl): Moduł kodera dla plików Postscript używający rozszerzenia DPS -Group: X11/Applications/Graphics -Requires: %{name} = %{version}-%{release} - -%description coder-dps -Coder module for Postcript files using DPS (Display PostScript) -extension. - -%description coder-dps -l pl -Moduł kodera dla plików Postscript używający rozszerzenia DPS (Display -PostScript). - %package coder-fpx Summary: Coder module for FlashPIX (FPX) files Summary(pl): Moduł kodera dla plików FlashPIX (FPX) @@ -553,6 +540,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 find PerlMagick scripts www -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl=' {} \; @@ -568,6 +556,7 @@ --enable-fast-install \ --enable-shared \ --disable-ltdl-install \ + --without-dps \ --with%{!?with_fpx:out}-fpx \ --with%{!?with_gs:out}-gslib \ --with%{!?with_jasper:out}-jp2 \ @@ -801,12 +790,6 @@ %{_libdir}/libGraphicsMagick.a %{_libdir}/libGraphicsMagickWand.a -%files coder-dps -%defattr(644,root,root,755) -# R: XFree86-DPS (libdps.so) -%attr(755,root,root) %{modulesdir}/coders/dps.so -%{modulesdir}/coders/dps.la - %if %{with fpx} %files coder-fpx %defattr(644,root,root,755) @@ -934,5 +917,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2006/03/08 19:45:13 qboosh +- switched to modular xorg +- killed dps coder +- release 2 + Revision 1.1 2006/01/28 23:36:29 qboosh - new, based on ImageMagick.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GraphicsMagick.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
