[libxfce4ui] Conditionalize glade3 stuff so we can keep the same spec over branches

Kevin Fenzi kevin at fedoraproject.org
Wed Nov 6 23:25:47 UTC 2013


commit 41d5633401cf2ca474d3ea82f278fe925d381c1f
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Nov 6 16:07:44 2013 -0700

    Conditionalize glade3 stuff so we can keep the same spec over branches

 libxfce4ui.spec |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 53a5dab..a48e7c8 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -4,7 +4,7 @@
 
 Name:           libxfce4ui
 Version:        4.10.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Commonly used Xfce widgets
 
 Group:          System Environment/Libraries
@@ -25,7 +25,9 @@ BuildRequires:  pkgconfig(libxfconf-0) >= %{xfceversion}
 BuildRequires:  pkgconfig(libstartup-notification-1.0) >= 0.4
 BuildRequires:  gtk-doc
 BuildRequires:  desktop-file-utils
+%if 0%{?fedora} > 20
 BuildRequires:  glade3-libgladeui-devel >= 3.5.0
+%endif
 BuildRequires:  gettext
 BuildRequires:  intltool
 # FIXME: obsolete libxfcegui4 one day 
@@ -52,7 +54,9 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       libxfce4util-devel
+%if 0%{?fedora} > 20
 Requires:       glade3-libgladeui-devel
+%endif
 Requires:       pkgconfig
 # FIXME: obsolete libxfcegui4 one day 
 #Provides:       libxfcegui4-devel = %{version}
@@ -68,7 +72,12 @@ developing applications that use %{name}.
 %patch10 -p1 -b .shortcuts
 
 %build
-%configure --enable-gtk-doc --disable-static
+%configure --enable-gtk-doc \
+%if 0%{?fedora} < 21
+           --disable-gladeui \
+%endif
+           --disable-static
+
 # Remove rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -120,13 +129,18 @@ rm -rf %{buildroot}
 %doc TODO
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/glade3/modules/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %doc %{_datadir}/gtk-doc/
+%if 0%{?fedora} > 20
+%{_libdir}/glade3/modules/lib*.so
 %{_datadir}/glade3/catalogs/%{name}.xml*
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
+%endif
 
 %changelog
+* Wed Nov 06 2013 Kevin Fenzi <kevin at scrye.com> 4.10.0-8
+- Conditionalize glade3 stuff so we can keep the same spec over branches. 
+
 * Wed Nov 06 2013 Lubomir Rintel <lkundrak at v3.sk> - 4.10.0-7
 - Re-enable glade3 module, it works now
 


More information about the scm-commits mailing list