From 5cfc53262f49a15edd47c3f24be3c889a4f0c6ac6ec7067f0213fa07cb828748 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Jan 2009 01:17:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plotutils?expand=0&rev=5 --- plotutils-2.5.1.tar.bz2 | 3 + plotutils-2.5.tar.bz2 | 3 - plotutils-autoreconf.patch | 10 + plotutils-dasharray-format.patch | 11 + plotutils-2.5.dif => plotutils-man.patch | 22 -- plotutils-uninitialized.patch | 11 + plotutils.changes | 14 + plotutils.spec | 328 ++++++++++++++--------- 8 files changed, 244 insertions(+), 158 deletions(-) create mode 100644 plotutils-2.5.1.tar.bz2 delete mode 100644 plotutils-2.5.tar.bz2 create mode 100644 plotutils-autoreconf.patch create mode 100644 plotutils-dasharray-format.patch rename plotutils-2.5.dif => plotutils-man.patch (57%) create mode 100644 plotutils-uninitialized.patch diff --git a/plotutils-2.5.1.tar.bz2 b/plotutils-2.5.1.tar.bz2 new file mode 100644 index 0000000..27b5ee9 --- /dev/null +++ b/plotutils-2.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb8d23e2ed3e715847e1bfd23bf5823871105388332baffc0cbc5eec2c0fa2a5 +size 3129574 diff --git a/plotutils-2.5.tar.bz2 b/plotutils-2.5.tar.bz2 deleted file mode 100644 index ef7aade..0000000 --- a/plotutils-2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6c1ef815d73e8d2acd2458623c27f30563d8c2bc480b6c52c829e57d7d9b475 -size 3174070 diff --git a/plotutils-autoreconf.patch b/plotutils-autoreconf.patch new file mode 100644 index 0000000..e6f697d --- /dev/null +++ b/plotutils-autoreconf.patch @@ -0,0 +1,10 @@ +--- configure.ac ++++ configure.ac +@@ -64,6 +64,7 @@ + # Note: this can apparently alter CFLAGS, on a few platforms, e.g., on + # SCO OpenServer 5 (i.e. *-*-sco3.2v5*), "-belf" is added. + AC_PROG_LIBTOOL ++AC_PROG_CXX + + # Determine extension (e.g. ".exe") on executables, if any. + AC_EXEEXT diff --git a/plotutils-dasharray-format.patch b/plotutils-dasharray-format.patch new file mode 100644 index 0000000..54b3ecd --- /dev/null +++ b/plotutils-dasharray-format.patch @@ -0,0 +1,11 @@ +--- libplot/s_path.c ++++ libplot/s_path.c 2009-01-08 12:03:26.569330579 +0100 +@@ -716,7 +716,7 @@ write_svg_path_style (plOutbuf *page, co + { + sprintf (page->point, "%.5g%s", + dashbuf[i], +- i < num_dashes - 1 ? " " : "\""); ++ i < num_dashes - 1 ? " " : "\" "); + _update_buffer (page); + } + diff --git a/plotutils-2.5.dif b/plotutils-man.patch similarity index 57% rename from plotutils-2.5.dif rename to plotutils-man.patch index e35d931..d724359 100644 --- a/plotutils-2.5.dif +++ b/plotutils-man.patch @@ -50,25 +50,3 @@ +.BR plotfont (1), +.BR spline (1), +.BR tek2plot (1). ---- libplot/g_range.c -+++ libplot/g_range.c 2006-05-22 14:59:13.000000000 +0200 -@@ -172,7 +172,7 @@ _set_line_end_bbox (plOutbuf *bufp, doub - void - _set_line_join_bbox (plOutbuf *bufp, double xleft, double yleft, double x, double y, double xright, double yright, double linewidth, int joinstyle, double miterlimit, double m[6]) - { -- plVector v1, v2, vsum; -+ plVector v1 = {0.0, 0.0}, v2 = {0.0, 0.0}, vsum; - double v1len, v2len; - double halfwidth; - double mitrelen; ---- libplot/s_path.c -+++ libplot/s_path.c 2009-01-08 12:03:26.569330579 +0100 -@@ -716,7 +716,7 @@ write_svg_path_style (plOutbuf *page, co - { - sprintf (page->point, "%.5g%s", - dashbuf[i], -- i < num_dashes - 1 ? " " : "\""); -+ i < num_dashes - 1 ? " " : "\" "); - _update_buffer (page); - } - diff --git a/plotutils-uninitialized.patch b/plotutils-uninitialized.patch new file mode 100644 index 0000000..db747de --- /dev/null +++ b/plotutils-uninitialized.patch @@ -0,0 +1,11 @@ +--- libplot/g_range.c ++++ libplot/g_range.c 2006-05-22 14:59:13.000000000 +0200 +@@ -172,7 +172,7 @@ + void + _set_line_join_bbox (plOutbuf *bufp, double xleft, double yleft, double x, double y, double xright, double yright, double linewidth, int joinstyle, double miterlimit, double m[6]) + { +- plVector v1, v2, vsum; ++ plVector v1 = {0.0, 0.0}, v2 = {0.0, 0.0}, vsum; + double v1len, v2len; + double halfwidth; + double mitrelen; diff --git a/plotutils.changes b/plotutils.changes index db7a8e5..2c78b2f 100644 --- a/plotutils.changes +++ b/plotutils.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jan 8 16:35:53 CET 2009 - sbrabec@suse.cz + +- Updated to version 2.5.1: + * Minor SVG output format fixes for compatability with SVG 1.1. + * Error formatting changes. + * New license: GPL version 3. +- Install upstream man pages. +- Split package and patch according to packaging rules. +- Simplified spec file. +- Disabled static libraries. +- Update lex & bison files. +- Removed obsolete version checks. + ------------------------------------------------------------------- Thu Jan 8 12:04:02 CET 2009 - werner@suse.de diff --git a/plotutils.spec b/plotutils.spec index 2756fda..a22667a 100644 --- a/plotutils.spec +++ b/plotutils.spec @@ -1,5 +1,5 @@ # -# spec file for package plotutils (Version 2.5) +# spec file for package plotutils (Version 2.5.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,38 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -Url: http://www.gnu.org/software/plotutils/plotutils.html Name: plotutils -BuildRequires: gcc-c++ libpng libpng-devel zlib zlib-devel -%if %suse_version > 910 -BuildRequires: xorg-x11 xorg-x11-devel -%else -BuildRequires: XFree86 XFree86-devel -%endif -%if "%(xft-config --prefix)" == "/usr" -%define fontdir /usr/share/fonts/misc -%define xlibraries /usr/%{_lib} -%define xincludes /usr/include -%else -%define fontdir /usr/X11R6/lib/X11/fonts/misc -%define xlibraries /usr/X11R6/%{_lib} -%define xincludes /usr/X11R6/include -%endif +BuildRequires: bison flex gcc-c++ libpng-devel xorg-x11-devel zlib-devel License: GPL v2 or later; GPL v3 or later +Url: http://www.gnu.org/software/plotutils/plotutils.html Group: Productivity/Graphics/Visualization/Graph -AutoReqProv: on PreReq: %install_info_prereq %suseconfig_fonts_prereq -Obsoletes: plotutil -Provides: plotutil -Version: 2.5 -Release: 198 +Version: 2.5.1 +Release: 1 Summary: GNU Plotting Utilities -Source0: plotutils-2.5.tar.bz2 -Patch: plotutils-2.5.dif +Source: %{name}-%{version}.tar.bz2 +Patch: plotutils-man.patch +Patch1: plotutils-uninitialized.patch +Patch2: plotutils-dasharray-format.patch +Patch3: plotutils-autoreconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define fontdir %{_datadir}/fonts/misc %description The GNU plotting utilities consist of seven command line programs: the @@ -67,136 +53,212 @@ Authors: Nick Tufillaro James J. Clark +%package devel +License: GPL v2 or later; GPL v3 or later +Summary: GNU Plotting Utilities +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} glibc-devel libpng-devel zlib-devel + +%description devel +The GNU plotting utilities consist of seven command line programs: the +graphics programs `graph', `plot', `tek2plot', and `plotfont', and the +mathematical programs `spline', `ode', and `double'. GNU `libplot' is +distributed with these programs; it is the library on which the +graphics programs are based. `Libplot' is a function library for +device-independent two-dimensional vector graphics, including vector +graphics animations under the X Window System. + + + +Authors: +-------- + Rich Murphey + Robert Maier + Edward Moy + Nick Tufillaro + James J. Clark + +%package -n libplot2 +License: GPL v2 or later; GPL v3 or later +Summary: GNU Plotting Utilities +Group: System/Libraries + +%description -n libplot2 +The GNU plotting utilities consist of seven command line programs: the +graphics programs `graph', `plot', `tek2plot', and `plotfont', and the +mathematical programs `spline', `ode', and `double'. GNU `libplot' is +distributed with these programs; it is the library on which the +graphics programs are based. `Libplot' is a function library for +device-independent two-dimensional vector graphics, including vector +graphics animations under the X Window System. + + + +Authors: +-------- + Rich Murphey + Robert Maier + Edward Moy + Nick Tufillaro + James J. Clark + +%package -n libplotter2 +License: GPL v2 or later; GPL v3 or later +Summary: GNU Plotting Utilities +Group: System/Libraries + +%description -n libplotter2 +The GNU plotting utilities consist of seven command line programs: the +graphics programs `graph', `plot', `tek2plot', and `plotfont', and the +mathematical programs `spline', `ode', and `double'. GNU `libplot' is +distributed with these programs; it is the library on which the +graphics programs are based. `Libplot' is a function library for +device-independent two-dimensional vector graphics, including vector +graphics animations under the X Window System. + + + +Authors: +-------- + Rich Murphey + Robert Maier + Edward Moy + Nick Tufillaro + James J. Clark + +%package -n libxmi0 +License: GPL v2 or later; GPL v3 or later +Summary: GNU Plotting Utilities +Group: System/Libraries + +%description -n libxmi0 +The GNU plotting utilities consist of seven command line programs: the +graphics programs `graph', `plot', `tek2plot', and `plotfont', and the +mathematical programs `spline', `ode', and `double'. GNU `libplot' is +distributed with these programs; it is the library on which the +graphics programs are based. `Libplot' is a function library for +device-independent two-dimensional vector graphics, including vector +graphics animations under the X Window System. + + + +Authors: +-------- + Robert Maier + Brian Kelleher + Joel McCormack + Todd Newman + Keith Packard + Bob Scheifler + Ken Whaley + %prep -%setup -n plotutils-2.5 +%setup -q %patch +%patch1 +%patch2 +%patch3 +# Force update lex and bison code: +rm $(fgrep -rl "made by GNU Bison" . ; fgrep -rl "A Bison parser, made from" . ; fgrep -rl '"lex.yy.c"' .) %build - %{?suse_update_config:%{suse_update_config -f}} - libtoolize --copy --force - aclocal - autoconf - X11LIB=%{xlibraries} - CC="gcc" - CFLAGS="${RPM_OPT_FLAGS} -pipe" - CXX="g++" - CXXFLAGS="$CFLAGS" - CPPFLAGS="-I%{xincludes}" - LDFLAGS="-L${X11LIB}" - export CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - ./configure %{_target_platform} \ - --prefix=/usr \ - --libexecdir=%{_libdir} \ - --libdir=%{_libdir} \ - --with-gcc \ - --with-gnu-ld \ - --enable-libplotter \ - --enable-libxmi \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --with-x --x-includes=%{xincludes} --x-libraries=${X11LIB} - make CC=$CC CXX="$CXX" \ - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" +autoreconf -f -i +%configure\ + --disable-static\ + --enable-libplotter\ + --enable-libxmi +# FIXME: lex/bison update break parallel build: +#make %{?jobs:-j%jobs} +make %install - make install DESTDIR=${RPM_BUILD_ROOT} - chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libplot.so.* - # - rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil - install -m 0444 AUTHORS ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 COMPAT ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 COPYING ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 INSTALL.fonts ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 KNOWN_BUGS ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 PROBLEMS ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 README ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 THANKS ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - install -m 0444 TODO ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - mv ${RPM_BUILD_ROOT}/usr/share/libplot ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - mv ${RPM_BUILD_ROOT}/usr/share/ode ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - mv ${RPM_BUILD_ROOT}/usr/share/pic2plot ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - mv ${RPM_BUILD_ROOT}/usr/share/tek2plot ${RPM_BUILD_ROOT}%{_defaultdocdir}/plotutil/ - # - mkdir -p ${RPM_BUILD_ROOT}%{fontdir} - install -m 0444 fonts/pcf/*.pcf ${RPM_BUILD_ROOT}%{fontdir}/ - gzip -9f ${RPM_BUILD_ROOT}%{fontdir}/*.pcf - # - install -m 0444 manpage.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/plotutils.1 - gzip -9f ${RPM_BUILD_ROOT}%{_mandir}/man1/plotutils.1 - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/double.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/graph.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/ode.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pic2plot.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/plot.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/plotfont.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/spline.1.gz - ln -sf plotutils.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/tek2plot.1.gz - # +%makeinstall\ + libplotdatadir=%{_docdir}/%{name}/libplot\ + odedatadir=%{_docdir}/%{name}/ode\ + tek2plotdatadir=%{_docdir}/%{name}/tek2plot\ + pic2plotdatadir=%{_docdir}/%{name}/pic2plot +# +install -m 0644\ + AUTHORS COMPAT COPYING INSTALL.fonts KNOWN_BUGS PROBLEMS README THANKS\ + TODO $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +# +install -d $RPM_BUILD_ROOT%{fontdir} +install -m 0644 fonts/pcf/*.pcf $RPM_BUILD_ROOT%{fontdir} +gzip -9 ${RPM_BUILD_ROOT}%{fontdir}/*.pcf +# +install -m 0644 manpage.1 $RPM_BUILD_ROOT%{_mandir}/man1/plotutils.1 +ln -s plotutils.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/double.1.gz +ln -s plotutils.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/graph.1.gz +ln -s plotutils.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/pic2plot.1.gz %post -/sbin/ldconfig %install_info --info-dir=%{_infodir} %{_infodir}/plotutils.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/libxmi.info.gz %run_suseconfig_fonts %postun -/sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/plotutils.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/libxmi.info.gz %run_suseconfig_fonts +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libxmi.info.gz + +%postun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libxmi.info.gz + +%post -n libplot2 -p /sbin/ldconfig + +%postun -n libplot2 -p /sbin/ldconfig + +%post -n libplotter2 -p /sbin/ldconfig + +%postun -n libplotter2 -p /sbin/ldconfig + +%post -n libxmi0 -p /sbin/ldconfig + +%postun -n libxmi0 -p /sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/usr/bin/double -/usr/bin/graph -/usr/bin/ode -/usr/bin/pic2plot -/usr/bin/plot -/usr/bin/plotfont -/usr/bin/spline -/usr/bin/tek2plot -%doc %{_defaultdocdir}/plotutil/ -/usr/include/plot.h -/usr/include/plotcompat.h -/usr/include/plotter.h -/usr/include/xmi.h -%doc %{_infodir}/plotutils.info.gz -%doc %{_infodir}/libxmi.info.gz -%{_libdir}/libplot.so.2.2.2 -%{_libdir}/libplot.so.2 -%{_libdir}/libplot.so -%{_libdir}/libplot.la -%{_libdir}/libplot.a -%{_libdir}/libxmi.so.0.1.3 -%{_libdir}/libxmi.so.0 -%{_libdir}/libxmi.so -%{_libdir}/libxmi.la -%{_libdir}/libxmi.a -%{_libdir}/libplotter.so.2.2.2 -%{_libdir}/libplotter.so.2 -%{_libdir}/libplotter.so -%{_libdir}/libplotter.la -%{_libdir}/libplotter.a -%doc %{_mandir}/man1/plotutils.1.gz -%doc %{_mandir}/man1/double.1.gz -%doc %{_mandir}/man1/graph.1.gz -%doc %{_mandir}/man1/ode.1.gz -%doc %{_mandir}/man1/pic2plot.1.gz -%doc %{_mandir}/man1/plot.1.gz -%doc %{_mandir}/man1/plotfont.1.gz -%doc %{_mandir}/man1/spline.1.gz -%doc %{_mandir}/man1/tek2plot.1.gz -%dir %{fontdir} -%{fontdir}/tekfont0.pcf.gz -%{fontdir}/tekfont1.pcf.gz -%{fontdir}/tekfont2.pcf.gz -%{fontdir}/tekfont3.pcf.gz +%doc %{_docdir}/%{name} +%{_bindir}/* +%doc %{_infodir}/plotutils*.info* +%doc %{_mandir}/man?/*.* +%{fontdir} + +%files devel +%defattr(-,root,root) +%{_libdir}/lib*.so +%{_libdir}/lib*.*a +%{_includedir}/*.h +%doc %{_infodir}/libxmi*.info* + +%files -n libplot2 +%defattr(-,root,root) +%{_libdir}/libplot.so.* + +%files -n libplotter2 +%defattr(-,root,root) +%{_libdir}/libplotter.so.* + +%files -n libxmi0 +%defattr(-,root,root) +%{_libdir}/libxmi.so.* %changelog +* Thu Jan 08 2009 sbrabec@suse.cz +- Updated to version 2.5.1: + * Minor SVG output format fixes for compatability with SVG 1.1. + * Error formatting changes. + * New license: GPL version 3. +- Install upstream man pages. +- Split package and patch according to packaging rules. +- Simplified spec file. +- Disabled static libraries. +- Update lex & bison files. +- Removed obsolete version checks. * Thu Jan 08 2009 werner@suse.de - Add a fix in libplot/s_path.c to get valid SVG files (bnc#464381) * Thu Aug 10 2006 mfabian@suse.de