Author: djurban                      Date: Tue Jul 19 21:15:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to version 8.51, inclues the libgs.so and works, rel. 1
- added bcond without gtk for gsx, patches -ijs_cflags and -gevcd8-fixes.patch
  no longer necessary, second patche's device no longer existant
- added fontdir configure option and links with system jasper
- will add link to dynamic jbig2dec ocne someone makes it dynamic in the spec

---- Files affected:
SPECS:
   ghostscript.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: SPECS/ghostscript.spec
diff -u SPECS/ghostscript.spec:1.147 SPECS/ghostscript.spec:1.148
--- SPECS/ghostscript.spec:1.147        Wed Jun  8 20:37:37 2005
+++ SPECS/ghostscript.spec      Tue Jul 19 23:15:47 2005
@@ -3,12 +3,11 @@
 # TODO:
 #      - fix svga bcond
 #      - create shared libijs
-#      - link with dynamic jasper and jbig2dec
-#      - update patches
+#      - link with dynamic jbig2dec
 #
-
 # Conditional build:
 %bcond_with    svga            # with svgalib display support (vgalib and 
lvga256 devices)
+%bcond_without gtk             # without gsx 
 #
 Summary:       PostScript & PDF interpreter and renderer
 Summary(de):   PostScript & PDF Interpreter und Renderer
@@ -17,12 +16,12 @@
 Summary(pl):   Bezpłatny interpreter i renderer PostScriptu i PDF
 Summary(tr):   PostScript & PDF yorumlayýcý ve gösterici
 Name:          ghostscript
-Version:       8.50
-Release:       0.2
+Version:       8.51
+Release:       1
 License:       AFPL
 Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/ghostscript/%{name}-%{version}.tar.bz2
-# Source0-md5: bd49a30d7485ad382f69b49a06d045fd
+# Source0-md5: 8b328b47cce3b7f97f35296aae8e7b77
 # we need to link with libjpeg recompiled with our parameters
 Source2:       ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
 # Source2-md5: dbd5f3b47ed13132f04c685d608a7547
@@ -31,8 +30,9 @@
 Patch0:                %{name}-missquotes.patch
 Patch1:                %{name}-setuid.patch
 Patch2:                %{name}-time_h.patch
-Patch3:                %{name}-ijs_cflags.patch
-Patch4:                %{name}-gdevcd8-fixes.patch
+Patch3:                %{name}-am.patch
+# no device for cdj850 in non-espgs ghostscript
+#Patch4:               %{name}-gdevcd8-fixes.patch
 Patch5:                %{name}-glib.patch
 Patch6:                %{name}-ijs_pkgconfig_64.patch
 URL:           http://www.ghostscript.com/
@@ -42,7 +42,7 @@
 BuildRequires: docbook-style-dsssl
 BuildRequires: glib2-devel
 # for gsx
-#BuildRequires:        gtk+-devel
+%{?with_gtk:BuildRequires:     gtk+-devel}
 BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
@@ -143,10 +143,10 @@
 
 %prep
 %setup -q -a2
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1 -b .am
 #%patch4 -p1
 #%patch5 -p1
 %patch6 -p1
@@ -155,8 +155,8 @@
 %build
 # workarounds
 touch ijs/ijs-config.1
-#
-sed -i -e 
's#:$(gsdir)/fonts#:$(gsdir)/fonts:%{_datadir}/fonts:%{_datadir}/fonts/Type1#g' 
src/Makefile.in
+# not really needed with new patch :)
+# sed -i -e 
's#:$(gsdir)/fonts#:$(gsdir)/fonts:%{_datadir}/fonts:%{_datadir}/fonts/Type1#g' 
src/Makefile.in
 #
 cp -f %{_datadir}/automake/config.sub .
 %{__aclocal}
@@ -164,7 +164,7 @@
 CFLAGS="%{rpmcflags} -DA4"
 export CFLAGS
 %configure \
-       --with-drivers=ALL%{?with_svga:,vgalib,lvga256} \
+       --with-fontpath="%{_datadir}/fonts:%{_datadir}/fonts/Type1" \
        --with-ijs \
        --with-jbig2dec \
        --with-jasper \
@@ -172,7 +172,6 @@
 
 # NEEDS patch because no such configure options
 #        --with-drivers=ALL%{?with_svga:,vgalib,lvga256} \
-#        --with-fontpath="%{_datadir}/fonts:%{_datadir}/fonts/Type1" \
 
 cd ijs
 %{__aclocal}
@@ -181,15 +180,16 @@
 %configure
 cd ..
 
-#%%{__make} so \
 %{__make} \
        docdir=%{_defaultdocdir}/%{name}-%{version}
 
+%{__make} so \
+       docdir=%{_defaultdocdir}/%{name}-%{version}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d 
$RPM_BUILD_ROOT{%{_datadir}/ghostscript/lib,%{_libdir},%{_includedir}}
 
-#%%{__make} soinstall \
 %{__make} install \
        install_prefix=$RPM_BUILD_ROOT \
        prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -199,6 +199,16 @@
        docdir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version} \
        mandir=$RPM_BUILD_ROOT%{_mandir}
 
+
+%{__make} soinstall \
+       install_prefix=$RPM_BUILD_ROOT \
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
+       bindir=$RPM_BUILD_ROOT%{_bindir} \
+       datadir=$RPM_BUILD_ROOT%{_datadir} \
+       libdir=$RPM_BUILD_ROOT%{_libdir} \
+       docdir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version} \
+       mandir=$RPM_BUILD_ROOT%{_mandir}
+
 cd ijs
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -248,8 +258,8 @@
 %attr(755,root,root) %{_bindir}/gs
 %attr(755,root,root) %{_bindir}/wftopfa
 %attr(755,root,root) %{_bindir}/gs[!x]*
-%attr(755,root,root) %{_bindir}/ijs_client_example
-#%attr(755,root,root) %{_libdir}/libgs.so.*.*
+%attr(755,root,root) %{_bindir}/ijs_*_example
+%attr(755,root,root) %{_libdir}/libgs.so.*.*
 #%attr(755,root,root) %{_libdir}/libijs.so
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/lib
@@ -258,8 +268,10 @@
 %dir %{_datadir}/%{name}/%{version}/lib
 # "*.*" will not match "Fontmap". It is OK.
 %{_datadir}/%{name}/%{version}/lib/*.*
-%{_datadir}/%{name}/%{version}/lib/*map
+%{_datadir}/%{name}/%{version}/lib/[!F]*map
+%{_datadir}/%{name}/%{version}/lib/FAPI*map
 %config %verify(not size md5 mtime) %{_datadir}/%{name}/%{version}/lib/Fontmap
+%config %verify(not size md5 mtime) 
%{_datadir}/%{name}/%{version}/lib/FAPIconfig
 %{_datadir}/%{name}/%{version}/Resource
 %{_datadir}/%{name}/%{version}/examples
 %{_mandir}/man*/*
@@ -269,14 +281,16 @@
 %lang(fr) %{_mandir}/fr/man*/*
 %lang(pl) %{_mandir}/pl/man*/*
 
-#%files gtk
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/gsx
-
-#%files devel
-#%defattr(644,root,root,755)
-#%%{_includedir}/ps
-#%%{_libdir}/libgs.so
+%if %{with gtk}
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gsx
+%endif
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/ps
+%{_libdir}/libgs.so
 
 %files ijs-devel
 %defattr(644,root,root,755)
@@ -295,6 +309,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2005/07/19 21:15:47  djurban
+- updated to version 8.51, inclues the libgs.so and works, rel. 1
+- added bcond without gtk for gsx, patches -ijs_cflags and -gevcd8-fixes.patch
+  no longer necessary, second patche's device no longer existant
+- added fontdir configure option and links with system jasper
+- will add link to dynamic jbig2dec ocne someone makes it dynamic in the spec
+
 Revision 1.147  2005/06/08 18:37:37  twittner
 - ghostscript-esp.spec and ghostscript.spec obsolete each other
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ghostscript.spec?r1=1.147&r2=1.148&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to