[graphviz/private-rawhide-2.32] New version

[Jaroslav Škarvada]

commit 80d1f22da8322dbb3763353164f8390d8c99cc87
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Aug 19 17:14:20 2013 +0200

    New version
    
      Resolves: rhbz#991752
    - Dropped guile2-fix, cgraph, lua-52, smyrna-doc-opt, gv2gml-options-fix,
      lefty-help, prune-help, man-fix patches (all upstreamed)

 graphviz-2.30.1-guile2-fix.patch                   |   27 ---
 graphviz-2.30.1-gv2gml-options-fix.patch           |   12 --
 graphviz-2.30.1-gvc.pc-no-libgraph.patch           |   11 --
 graphviz-2.30.1-lefty-help.patch                   |   82 ----------
 graphviz-2.30.1-lua-5.2.patch                      |   99 -----------
 graphviz-2.30.1-man-fix.patch                      |  172 --------------------
 graphviz-2.30.1-prune-help.patch                   |   45 -----
 graphviz-2.30.1-smyrna-doc-opt.patch               |   17 --
 ...patch => graphviz-2.32.0-rtest-errout-fix.patch |    8 +-
 ... => graphviz-2.32.0-testsuite-sigsegv-fix.patch |   12 +-
 graphviz.spec                                      |   45 ++----
 11 files changed, 26 insertions(+), 504 deletions(-)
---
diff --git a/graphviz-2.26.0-rtest-errout-fix.patch b/graphviz-2.32.0-rtest-errout-fix.patch
similarity index 69%
rename from graphviz-2.26.0-rtest-errout-fix.patch
rename to graphviz-2.32.0-rtest-errout-fix.patch
index 83f0cb2..37f7d29 100644
--- a/graphviz-2.26.0-rtest-errout-fix.patch
+++ b/graphviz-2.32.0-rtest-errout-fix.patch
@@ -1,6 +1,8 @@
---- graphviz-2.26.0/rtest/rtest.sh.old	2009-12-06 00:27:49.000000000 +0100
-+++ graphviz-2.26.0/rtest/rtest.sh	2010-10-22 10:37:42.952893435 +0200
-@@ -279,14 +279,16 @@
+diff --git a/rtest/rtest.sh b/rtest/rtest.sh
+index ad6e14b..94bc044 100755
+--- a/rtest/rtest.sh
++++ b/rtest/rtest.sh
+@@ -280,14 +280,16 @@ function doTest
      $testcmd 2> errout
      RVAL=$?
  
diff --git a/graphviz-2.26.0-testsuite-sigsegv-fix.patch b/graphviz-2.32.0-testsuite-sigsegv-fix.patch
similarity index 72%
rename from graphviz-2.26.0-testsuite-sigsegv-fix.patch
rename to graphviz-2.32.0-testsuite-sigsegv-fix.patch
index d278bc1..2ee17cb 100644
--- a/graphviz-2.26.0-testsuite-sigsegv-fix.patch
+++ b/graphviz-2.32.0-testsuite-sigsegv-fix.patch
@@ -1,6 +1,8 @@
---- graphviz-2.26.0/lib/gvc/gvconfig.c.old	2009-07-08 17:14:20.000000000 +0200
-+++ graphviz-2.26.0/lib/gvc/gvconfig.c	2010-10-20 11:51:21.238392202 +0200
-@@ -471,6 +471,7 @@
+diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
+index dc3d578..0562ae8 100644
+--- a/lib/gvc/gvconfig.c
++++ b/lib/gvc/gvconfig.c
+@@ -507,6 +507,7 @@ void gvconfig(GVC_t * gvc, boolean rescan)
          libdir = gvconfig_libdir(gvc);
          rc = stat(libdir, &libdir_st);
          if (rc == -1) {
@@ -8,7 +10,7 @@
      	    /* if we fail to stat it then it probably doesn't exist so just fail silently */
  	    return;
          }
-@@ -485,6 +486,7 @@
+@@ -521,6 +522,7 @@ void gvconfig(GVC_t * gvc, boolean rescan)
          if (rescan) {
      	    config_rescan(gvc, gvc->config_path);
      	    gvc->config_found = TRUE;
@@ -16,7 +18,7 @@
      	    return;
          }
      
-@@ -492,6 +494,7 @@
+@@ -528,6 +530,7 @@ void gvconfig(GVC_t * gvc, boolean rescan)
      
          rc = stat(gvc->config_path, &config_st);
          if (rc == -1) {
diff --git a/graphviz.spec b/graphviz.spec
index 604fb70..6dac987 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -50,33 +50,18 @@
 
 Name:			graphviz
 Summary:		Graph Visualization Tools
-Version:		2.30.1
-Release:		14%{?dist}
+Version:		2.32.0
+Release:		1%{?dist}
 Group:			Applications/Multimedia
 License:		EPL
 URL:			http://www.graphviz.org/
 Source0:		http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-Patch2:			graphviz-2.30.1-guile2-fix.patch
 # Fix SIGSEGVs on testsuite (#645703).
-Patch3:			graphviz-2.26.0-testsuite-sigsegv-fix.patch
+Patch1:			graphviz-2.32.0-testsuite-sigsegv-fix.patch
 # Testsuite now do diff check also in case of err output (#645703).
-Patch4:			graphviz-2.26.0-rtest-errout-fix.patch
-# Now that libgraph is gone, reflect that in libgvc.pc
-Patch5:			graphviz-2.30.1-gvc.pc-no-libgraph.patch
-# Lua 5.2
-Patch6:			graphviz-2.30.1-lua-5.2.patch
-# Accepted upstream, ticket #2302
-Patch7:			graphviz-2.30.1-smyrna-doc-opt.patch
-# Accepted upstream, ticket #2304
-Patch8:			graphviz-2.30.1-gv2gml-options-fix.patch
-# Sent upstream, ticket #2305
-Patch9:			graphviz-2.30.1-lefty-help.patch
-# Sent upstream, ticket #2306
-Patch10:		graphviz-2.30.1-prune-help.patch
-# Sent upstream, ticket #2307
-Patch11:		graphviz-2.30.1-man-fix.patch
+Patch2:			graphviz-2.32.0-rtest-errout-fix.patch
 # Sent upstream, ticket #2322
-Patch12:		graphviz-2.30.1-perl-fix.patch
+Patch3:		graphviz-2.30.1-perl-fix.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
 BuildRequires:		ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@@ -274,17 +259,9 @@ Various tcl packages (extensions) for the graphviz tools.
 
 %prep
 %setup -q
-%patch2 -p1 -b .guile2-fix
-%patch3 -p1 -b .testsuite-sigsegv-fix
-%patch4 -p1 -b .rtest-errout-fix
-%patch5 -p1 -b .cgraph
-%patch6 -p1 -b .lua-52
-%patch7 -p1 -b .smyrna-doc-opt
-%patch8 -p1 -b .gv2gml-options-fix
-%patch9 -p1 -b .lefty-help
-%patch10 -p1 -b .prune-help
-%patch11 -p1 -b .man-fix
-%patch12 -p1 -b .perl-fix
+%patch1 -p1 -b .testsuite-sigsegv-fix
+%patch2 -p1 -b .rtest-errout-fix
+%patch3 -p1 -b .perl-fix
 
 # Attempt to fix rpmlint warnings about executable sources
 find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@@ -561,6 +538,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 19 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.32.0-1
+- New version
+  Resolves: rhbz#991752
+- Dropped guile2-fix, cgraph, lua-52, smyrna-doc-opt, gv2gml-options-fix,
+  lefty-help, prune-help, man-fix patches (all upstreamed)
+
 * Tue Aug  6 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.30.1-14
 - Used unversioned doc directory
   Resolves: rhbz#993803