- updated to 3.32, split into packages

- added opt patch and .m4 file from autotrace

Changed files:
    pstoedit-opt.patch -> 1.1
    pstoedit.spec -> 1.6

diff --git a/pstoedit-opt.patch b/pstoedit-opt.patch
new file mode 100644 (file)
index 0000000..76991c6
--- /dev/null
+++ b/pstoedit-opt.patch
@@ -0,0 +1,10 @@
+--- pstoedit-3.32/configure.ac.orig    Wed Aug 21 15:53:12 2002
++++ pstoedit-3.32/configure.ac Fri Dec 20 00:07:29 2002
+@@ -236,7 +236,6 @@
+     AC_MSG_RESULT([GNU])
+     SPECIAL_CXXFLAGS="-DBUGGYGPP -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wstrict-prototypes"
+   fi
+-  CXXFLAGS="-g" 
+ elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then
+   AC_MSG_RESULT([AIX xlC])
+   CXXFLAGS="-D__unix__ -g -+ -I/usr/lpp/xlC/src/nihC/aixinclude"  

diff --git a/pstoedit.spec b/pstoedit.spec
index 4a2482ebdf762ef182749aa824342e2407544533..e54a5106c0940161a49398060634b06aba2bb4d8 100644 (file)
--- a/pstoedit.spec
+++ b/pstoedit.spec
@@ -1,17 +1,23 @@
 Summary:       Convert PostScript and PDF files into various vector-graphic formats
 Summary(pl):   Konwerter PostScriptu i PDF do ró¿nych formatów wektorowych
 Name:          pstoedit
-Version:       3.30
+Version:       3.32
 Release:       1
 License:       GPL
 Group:         Applications/Graphics
-Source0:       http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/%{name}_3_30.zip
+Source0:       http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/%{name}-3.32.tar.gz
+Source1:       http://autotrace.sourceforge.net/tools/%{name}.m4
+Patch0:                %{name}-opt.patch
 URL:           http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
-BuildRequires: unzip
 BuildRequires: autoconf
-BuildRequires: libstdc++-devel
-BuildRequires: libpng-devel
+BuildRequires: automake
+BuildRequires: ImageMagick-c++-devel >= 5.4.8
+#BuildRequires:        libemf-devel ??? - libemf@lignumcomputing.com
 BuildRequires: libplotter-devel >= 2.3
+BuildRequires: libpng-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.4d-3
+BuildRequires: ming-devel
 Requires:      ghostscript
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,38 +39,131 @@ uproszczony PostScript i dowolny format jaki mog
 ghostscript lub GNU plotutils - np. Tektronix, CGM, ró¿ne formaty
 rastrowe.
 
+%package drv-lplot
+Summary:       lplot plugin for pstoedit library
+Summary(pl):   Wtyczka lplot dla biblioteki pstoedit
+Group:         Libraries
+Requires:      %{name} = %{version}
+
+%description drv-lplot
+lplot plugin for pstoedit library. It uses libplotter library.
+
+%description drv-lplot -l pl
+Wtyczka lplot dla biblioteki pstoedit. U¿ywa biblioteki libplotter.
+
+%package drv-magick
+Summary:       magick plugin for pstoedit library
+Summary(pl):   Wtyczka magick dla biblioteki pstoedit
+Group:         Libraries
+Requires:      %{name} = %{version}
+
+%description drv-magick
+magick plugin for pstoedit library. It uses Magick++ library.
+
+%description drv-magick -l pl
+Wtyczka magick (libplotter) dla biblioteki pstoedit. U¿ywa biblioteki
+Magick++.
+
+%package drv-swf
+Summary:       swf plugin for pstoedit library
+Summary(pl):   Wtyczka swf dla biblioteki pstoedit
+Group:         Libraries
+Requires:      %{name} = %{version}
+
+%description drv-swf
+swf plugin for pstoedit library. It uses Ming library.
+
+%description drv-swf -l pl
+Wtyczka swf dla biblioteki pstoedit. U¿ywa biblioteki Ming.
+
+%package devel
+Summary:       pstoedit library header files
+Summary(pl):   Pliki nag³ówkowe biblioteki pstoedit
+Group:         Development/Libraries
+Requires:      %{name} = %{version}
+
+%description devel
+pstoedit library header files.
+
+%description devel -l pl
+Pliki nag³ówkowe biblioteki pstoedit.
+
+%package static
+Summary:       pstoedit static libraries
+Summary(pl):   Biblioteki statyczne pstoedit
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}
+
+%description static
+pstoedit static libraries.
+
+%description static -l pl
+Biblioteki statyczne pstoedit.
+
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
+%patch -p1
 
 %build
-(cd config
+# need to rebuild - supplied libtool is broken (relink)
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
-%configure --libdir=%{_datadir}/pstoedit
-)
-(cd src
-cat Makefile | sed 's/-g -O2/%{rpmcflags}}/g' > Makefile.tmp
-mv -f Makefile.tmp Makefile
+%{__automake}
+
+CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6/include/X11"
+%configure
 %{__make}
-)
 
 %install
 rm -rf $RPM_BUILD_ROOT
-(cd src
+install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
+
 %{__make} install \
-       bindir=$RPM_BUILD_ROOT%{_bindir} \
-       libdir=$RPM_BUILD_ROOT%{_datadir}/pstoedit \
-       mandir=$RPM_BUILD_ROOT%{_mandir}
-)
+       DESTDIR=$RPM_BUILD_ROOT
+
+install doc/pstoedit.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE1} $RPM_BUILD_ROOT%{_aclocaldir}
+
 cp -af java $RPM_BUILD_ROOT%{_datadir}/pstoedit
 rm -f $RPM_BUILD_ROOT%{_datadir}/pstoedit/java/*/readme*
-cp -af misc/* $RPM_BUILD_ROOT%{_datadir}/pstoedit
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc readme.txt java/java1/readme_java1.txt *.htm java/java2/readme_java2.html
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/libpstoedit.so.*.*
+%dir %{_libdir}/pstoedit
+%attr(755,root,root) %{_libdir}/pstoedit/libp2edrvstd.so*
 %{_datadir}/pstoedit
 %{_mandir}/man1/*
+
+%files drv-lplot
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pstoedit/libp2edrvlplot.so*
+
+%files drv-magick
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pstoedit/libp2edrvmagick++.so*
+
+%files drv-swf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pstoedit/libp2edrvswf.so*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpstoedit.so
+%{_libdir}/libpstoedit.la
+%{_includedir}/pstoedit
+%{_pkgconfigdir}/*.pc
+%{_aclocaldir}/*.m4
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libpstoedit.a