SHA256
1
0
forked from pool/graphviz
Dominique Leuenberger 2018-12-05 08:37:52 +00:00 committed by Git OBS Bridge
commit bf539d7705
4 changed files with 48 additions and 24 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de
- use pkg-config with correct parameter, reported by Werner Fink
-------------------------------------------------------------------
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

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,10 @@ programs that use the graphviz libraries including man3 pages.
%patch6
%patch7
%patch8
%if 0 && 0%{?suse_version} >= 1500
# pkg-config returns 0 (TRUE) when guile-2.2 is present
if pkg-config --atleast-version=2.2 guile-2.2; then
sed "s/guile-2.0/guile-2.2/" -i configure.ac
%endif
fi
rm -f contrib/gprof2dot.awk

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de
- use pkg-config with correct parameter, reported by Werner Fink
-------------------------------------------------------------------
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

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,10 @@ programs that use the graphviz libraries including man3 pages.
%patch6
%patch7
%patch8
%if 0 && 0%{?suse_version} >= 1500
# pkg-config returns 0 (TRUE) when guile-2.2 is present
if pkg-config --atleast-version=2.2 guile-2.2; then
sed "s/guile-2.0/guile-2.2/" -i configure.ac
%endif
fi
rm -f contrib/gprof2dot.awk