From 6576f85c705ed9853e4da5535eeeb1d93241555759bbefd10dc7b50b21c531c6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 27 Nov 2009 14:14:24 +0000 Subject: [PATCH] Accepting request 25126 from Publishing Copy from Publishing/plotutils based on submit request 25126 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/25126 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plotutils?expand=0&rev=8 --- plotutils-2.5.1.tar.bz2 | 3 - plotutils-2.6.tar.bz2 | 3 + plotutils-dasharray-format.patch | 4 +- plotutils.changes | 6 ++ plotutils.spec | 111 +++---------------------------- 5 files changed, 20 insertions(+), 107 deletions(-) delete mode 100644 plotutils-2.5.1.tar.bz2 create mode 100644 plotutils-2.6.tar.bz2 diff --git a/plotutils-2.5.1.tar.bz2 b/plotutils-2.5.1.tar.bz2 deleted file mode 100644 index 27b5ee9..0000000 --- a/plotutils-2.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb8d23e2ed3e715847e1bfd23bf5823871105388332baffc0cbc5eec2c0fa2a5 -size 3129574 diff --git a/plotutils-2.6.tar.bz2 b/plotutils-2.6.tar.bz2 new file mode 100644 index 0000000..bb61e7d --- /dev/null +++ b/plotutils-2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22f5a99fb4814567e9d7af3a2f008bf4ea5dfb7b099991269e66ab99b5225729 +size 3155064 diff --git a/plotutils-dasharray-format.patch b/plotutils-dasharray-format.patch index 54b3ecd..af964f0 100644 --- a/plotutils-dasharray-format.patch +++ b/plotutils-dasharray-format.patch @@ -4,8 +4,8 @@ { sprintf (page->point, "%.5g%s", dashbuf[i], -- i < num_dashes - 1 ? " " : "\""); -+ i < num_dashes - 1 ? " " : "\" "); +- i < num_dashes - 1 ? ", " : "\""); ++ i < num_dashes - 1 ? ", " : "\" "); _update_buffer (page); } diff --git a/plotutils.changes b/plotutils.changes index 647291f..a94f936 100644 --- a/plotutils.changes +++ b/plotutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 26 09:54:41 CET 2009 - werner@suse.de + +- Update to version 2.6 as this fix a copyright problem of mixing + GPL and non-commercial code (bnc#465378) + ------------------------------------------------------------------- Tue Jan 20 18:53:57 CET 2009 - crrodriguez@suse.de diff --git a/plotutils.spec b/plotutils.spec index 11d49b5..1a33162 100644 --- a/plotutils.spec +++ b/plotutils.spec @@ -1,5 +1,5 @@ # -# spec file for package plotutils (Version 2.5.1) +# spec file for package plotutils (Version 2.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: plotutils BuildRequires: bison flex gcc-c++ libpng-devel xorg-x11-devel zlib-devel -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Url: http://www.gnu.org/software/plotutils/plotutils.html Group: Productivity/Graphics/Visualization/Graph PreReq: %install_info_prereq %suseconfig_fonts_prereq -Version: 2.5.1 -Release: 2 +Version: 2.6 +Release: 1 Summary: GNU Plotting Utilities Source: %{name}-%{version}.tar.bz2 Patch: plotutils-man.patch @@ -54,7 +54,7 @@ Authors: James J. Clark %package devel -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: Development/Libraries/C and C++ Requires: %{name} = %{version} libstdc++-devel xorg-x11-libX11-devel @@ -80,7 +80,7 @@ Authors: James J. Clark %package -n libplot2 -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -104,7 +104,7 @@ Authors: James J. Clark %package -n libplotter2 -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -128,7 +128,7 @@ Authors: James J. Clark %package -n libxmi0 -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -160,7 +160,7 @@ Authors: %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"' .) +grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r rm -f %build autoreconf -f -i @@ -249,96 +249,3 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libxmi.so.* %changelog -* Tue Jan 20 2009 crrodriguez@suse.de -- fix -devel package dependencies (and build of package enblend-enfuse) -- remove "la" files -* 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 -- move fonts to /usr/share/fonts/misc (because of X11R7). -* Mon May 22 2006 werner@suse.de -- Update to plotutils 2.5 - libplot: - * support for rotated and sheared (i.e., "anamorphically - transformed") X Window System fonts has been completely rewritten. - * URW versions of the standard 35 Adobe fonts (Helvetica, - Times-Roman etc.) are now checked for under their own names on any - X Window System display, as well as under the Adobe names. - * SVG output is now conformant SVG 1.1 - * vertical positioning of text strings by the SVG driver improved - * the ROTATION parameter can now take values other than 0, 90, 180, and 270. - * modifiers fixed, such as appended "xsize=6in", "yoffset=8cm" - * problems with PS output triggering an error in some versions of - ghostscript now fixed - * most external symbols not meant to be publicly accessible now have - names beginning with the prefix "_pl_", to reduce the possibility - of namespace collisions. This will be completed in a later release. - graph: - * plotting of rotated y-axis labels by the `-Y' option, when `-T X' is - specified - * new short `-Q' option, equivalent to `--toggle-rotate-y-axis-label'. - graph,plot,tek2plot,plotfont,pic2plot: - * `--display-type' long option, the name of which confused some users, - has been changed to `--output-format'. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Dec 03 2004 mfabian@suse.de -- use new macro "%%run_suseconfig_fonts". -* Wed Dec 01 2004 werner@suse.de -- Do not be fooled by missing SuSEconfig module on non X11 systems -* Fri Mar 19 2004 mfabian@suse.de -- use %%suseconfig_fonts_prereq -- run SuSEconfig.fonts and SuSEconfig.pango in %%post and %%postun -* Sun Jan 11 2004 adrian@suse.de -- build as user -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Thu Apr 24 2003 ro@suse.de -- fix install_info --delete call and move from preun to postun -* Fri Feb 28 2003 werner@suse.de -- Fix bug #23452: use intall-info for info file -* Fri Nov 22 2002 olh@suse.de -- obsoletes/provides plotutil (#21848) -* Tue Sep 17 2002 ro@suse.de -- removed bogus self-provides -* Tue Jun 18 2002 meissner@suse.de -- rerun auto* tools. -* Fri May 03 2002 werner@suse.de -- Set correct X11 library path -- Automagic update of config.guess and config.sub -* Mon Dec 17 2001 werner@suse.de -- Update to 2.4.1 -- Use BuildRoot -- Rename package from plotutil to plotutils -* Tue Jun 26 2001 schwab@suse.de -- Fix for gcc 3.0. -* Tue May 08 2001 mfabian@suse.de -- bzip2 sources -* Wed May 31 2000 werner@suse.de -- Use %%{_defaultdocdir} -* Wed Mar 08 2000 bs@suse.de -- no ldconfig in %%post please. -* Fri Feb 11 2000 werner@suse.de -- Fix call of ldconfig, only if called in real root file system -* Thu Jan 20 2000 ro@suse.de -- update to 2.3 to make it build -- info,man: use macros to move to /usr/share -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Apr 05 1999 bs@suse.de -- fixed date strings in .changes. -* Fri Mar 26 1999 werner@suse.de -- Update to version 2.2 -* Wed Mar 03 1999 werner@suse.de -- New package, version 2.1.6