[mate-conf] Update spec file. Drop GTK package.
Dan Mashal
vicodan at fedoraproject.org
Sun Sep 2 07:54:52 UTC 2012
commit 44fb4534c86b0aaf7237f79845fa9381ef095462
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Sun Sep 2 00:53:59 2012 -0700
Update spec file. Drop GTK package.
mate-conf.spec | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/mate-conf.spec b/mate-conf.spec
index e83bb00..543dfaa 100644
--- a/mate-conf.spec
+++ b/mate-conf.spec
@@ -6,7 +6,7 @@
Summary: A process-transparent configuration system
Name: mate-conf
Version: 1.4.0
-Release: 15%{?dist}
+Release: 16%{?dist}
License: LGPLv2+ and GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
@@ -17,21 +17,21 @@ Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
# Remove schemas on package removal (not upgrade).
Source1: macros.mateconf
-BuildRequires: dbus-glib-devel >= 0.8
+BuildRequires: dbus-glib-devel
BuildRequires: gettext
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gobject-introspection-devel >= 0.9.5
+BuildRequires: glib2-devel
+BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
-BuildRequires: gtk-doc >= 1.0
+BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: mate-common
-BuildRequires: mate-corba-devel >= %{mate_corba_version}
+BuildRequires: mate-corba-devel
BuildRequires: openldap-devel
-BuildRequires: polkit-devel >= 0.92
+BuildRequires: polkit-devel
+BuildRequires: gtk+-devel
-Requires: dbus
# for patch0
Requires: /usr/bin/killall
@@ -46,21 +46,11 @@ support work group administration.
%package devel
Summary: Headers and libraries for mate-conf development
Requires: %{name}%{?_isa} = %{version}-%{release}
-# this one maybe could be dropped too, but not sure yet -- rex
-Requires: libxml2-devel
%description devel
mate-conf development package. Contains files needed for doing
development using mate-conf.
-%package gtk
-Summary: Graphical mate-conf utilities
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description gtk
-The mate-conf-gtk package contains graphical mate-conf utilities
-which require GTK+.
-
%prep
%setup -q -n mate-conf-%{version}
%patch0 -p1 -b .reload
@@ -99,7 +89,7 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
%post
/sbin/ldconfig
-
+ln -s
if [ $1 -gt 1 ]; then
if ! grep -f mateconf.xml.system %{_sysconfdir}/mateconf/2/path; then
sed -i -e 's at xml:readwrite:$(HOME)/.mateconf@&\n\n# Location for system-wide settings.\nxml:readonly:/etc/mateconf/mateconf.xml.system@' %{_sysconfdir}/mateconf/2/path
@@ -141,9 +131,6 @@ fi
%{_bindir}/mateconf-gsettings-data-convert
%{_bindir}/mateconf-gsettings-schema-convert
%{_libdir}/gio/modules/libgsettingsmateconfbackend.so
-
-%files gtk
-%doc COPYING NEWS README
%{_libexecdir}/mateconf-sanity-check-2
%files devel
@@ -155,6 +142,10 @@ fi
%{_datadir}/gir-1.0/
%changelog
+* Sun Sep 2 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-16
+- Drop the useless gtk package, and specific version requirements for buildrequires field.
+- Move mateconf-sanity-check-2 to the main package where it's needed
+
* Sun Aug 26 2012 Dan Mashal <dan.mashal at fedoraproject.org 1.4.0-15
- Bump release for repush
More information about the scm-commits
mailing list