[libxfce4ui] Re-enable glade3 module, it works now
Lubomir Rintel
lkundrak at fedoraproject.org
Wed Nov 6 21:01:32 UTC 2013
commit 128b40310e05673b4b92b127ec6420ca00b1aec2
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed Nov 6 21:52:21 2013 +0100
Re-enable glade3 module, it works now
Revert "Remove requirements for libxfcegui4-devel now that glade support was omitted"
This reverts commit 6e20081569b401176bcb3ed60a6cebd6e68bbb86.
Revert "Disable glade as it still uses old API"
This reverts commit a0e57955cc88ffeaf35d4e2f9c5efc3bc36badcf.
libxfce4ui.spec | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 9233993..53a5dab 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -4,7 +4,7 @@
Name: libxfce4ui
Version: 4.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Commonly used Xfce widgets
Group: System Environment/Libraries
@@ -25,8 +25,7 @@ BuildRequires: pkgconfig(libxfconf-0) >= %{xfceversion}
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.4
BuildRequires: gtk-doc
BuildRequires: desktop-file-utils
-# FIXME: Enable libglade again one day
-#BuildRequires: glade3-libgladeui-devel >= 3.5.0
+BuildRequires: glade3-libgladeui-devel >= 3.5.0
BuildRequires: gettext
BuildRequires: intltool
# FIXME: obsolete libxfcegui4 one day
@@ -53,8 +52,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk2-devel
Requires: libxfce4util-devel
-# FIXME: Enable libglade again one day
-#Requires: glade3-libgladeui-devel
+Requires: glade3-libgladeui-devel
Requires: pkgconfig
# FIXME: obsolete libxfcegui4 one day
#Provides: libxfcegui4-devel = %{version}
@@ -69,10 +67,8 @@ developing applications that use %{name}.
%setup -q
%patch10 -p1 -b .shortcuts
-
%build
-# FIXME: Enable libglade again one day
-%configure --enable-gtk-doc --disable-static --disable-gladeui
+%configure --enable-gtk-doc --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
@@ -124,10 +120,16 @@ rm -rf %{buildroot}
%doc TODO
%{_includedir}/*
%{_libdir}/*.so
+%{_libdir}/glade3/modules/lib*.so
%{_libdir}/pkgconfig/*.pc
%doc %{_datadir}/gtk-doc/
+%{_datadir}/glade3/catalogs/%{name}.xml*
+%{_datadir}/glade3/pixmaps/hicolor/*/actions/*
%changelog
+* Wed Nov 06 2013 Lubomir Rintel <lkundrak at v3.sk> - 4.10.0-7
+- Re-enable glade3 module, it works now
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list