rpm/graphviz
SHA256
1
0
Fork 0
forked from pool/graphviz
Code Pull Requests Activity

Accepting request 652600 from home:jbrielmaier:branches:graphics

Browse Source 
- Support dynamic move to Guile 2.2, part of boo#1117121:
  - Replace conditional pkgconfig(guile-2.[02]) BuildRequires with
    guile-devel: The package name is unchanged, which allows the
    distro projects to move wihout step-locking changes.
  - Patch configure.ac to look for guile-2.2 if guile 2.2 is being
    used.
- order inputs alphabetically

replaces https://build.opensuse.org/request/show/652442

OBS-URL: https://build.opensuse.org/request/show/652600
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=134
This commit is contained in:
Dirk Stoecker 2018-11-29 12:23:29 +00:00 committed by Git OBS Bridge
parent 06c0f40e8e
commit 8c7e27288e
4 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphviz-addons.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 29 10:21:10 UTC 2018 - jbrielmaier@suse.de
- Support dynamic move to Guile 2.2, part of boo#1117121:
- Replace conditional pkgconfig(guile-2.[02]) BuildRequires with
guile-devel: The package name is unchanged, which allows the
distro projects to move wihout step-locking changes.
- Patch configure.ac to look for guile-2.2 if guile 2.2 is being
used.
- order inputs alphabetically
-------------------------------------------------------------------
Fri Nov 16 15:21:38 UTC 2018 - trenn@suse.de

19
graphviz-addons.spec
View File

@ -66,6 +66,7 @@ BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: guile-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
@ -100,23 +101,17 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gtkglext-1.0)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xext)
# Disabled until guile 2.2 lands
%if 0 && 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(guile-2.2)
%else
BuildRequires: pkgconfig(guile-2.0)
%endif
BuildRequires: pkgconfig(ijs)
BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(tcl)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xext)
%if %{with java}
BuildRequires: java-devel >= 1.6.0
%endif
@ -314,9 +309,9 @@ programs that use the graphviz libraries including man3 pages.
%patch6
%patch7
%patch8
%if 0 && 0%{?suse_version} >= 1500
if pkgconfig --version-atleast=2.2 guile-2.2; then
sed "s/guile-2.0/guile-2.2/" -i configure.ac
%endif
fi
rm -f contrib/gprof2dot.awk

11
graphviz.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 29 10:21:10 UTC 2018 - jbrielmaier@suse.de
- Support dynamic move to Guile 2.2, part of boo#1117121:
- Replace conditional pkgconfig(guile-2.[02]) BuildRequires with
guile-devel: The package name is unchanged, which allows the
distro projects to move wihout step-locking changes.
- Patch configure.ac to look for guile-2.2 if guile 2.2 is being
used.
- order inputs alphabetically
-------------------------------------------------------------------
Fri Nov 16 15:21:38 UTC 2018 - trenn@suse.de

19
graphviz.spec
View File

@ -66,6 +66,7 @@ BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: guile-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
@ -100,23 +101,17 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gtkglext-1.0)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xext)
# Disabled until guile 2.2 lands
%if 0 && 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(guile-2.2)
%else
BuildRequires: pkgconfig(guile-2.0)
%endif
BuildRequires: pkgconfig(ijs)
BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(tcl)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xext)
%if %{with java}
BuildRequires: java-devel >= 1.6.0
%endif
@ -314,9 +309,9 @@ programs that use the graphviz libraries including man3 pages.
%patch6
%patch7
%patch8
%if 0 && 0%{?suse_version} >= 1500
if pkgconfig --version-atleast=2.2 guile-2.2; then
sed "s/guile-2.0/guile-2.2/" -i configure.ac
%endif
fi
rm -f contrib/gprof2dot.awk