[mate-conf] 1.4.0-19
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 26 12:23:58 UTC 2012
commit 570f22b08a512c4e0300d32e1e0ac4552f1ebf0b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Sep 26 07:23:58 2012 -0500
1.4.0-19
- fix macros.mateconf
- fix gio scriplets
- simplify some dir/file ownership
- drop Requires: desktop-file-utils
macros.mateconf | 172 +++++++++++++++++++++++++++---------------------------
mate-conf.spec | 70 +++++++++-------------
2 files changed, 114 insertions(+), 128 deletions(-)
---
diff --git a/macros.mateconf b/macros.mateconf
index ae99e17..ed53523 100644
--- a/macros.mateconf
+++ b/macros.mateconf
@@ -1,86 +1,86 @@
--#
--# RPM macros for mateconf applications.
--#
--# (c) 2006-2007 SUSE LINUX
--# Author: Stanislav Brabec <sbrabec at suse.cz>
--# (c) 2009 Red Hat, Inc
--# Author: Toshio Kuratomi <toshio at fedoraproject.org>
--#
--# License: LGPLv2+
--#
--# Usage:
--#
--# Preamble:
--# Requires(pre): MateConf2
--# Requires(preun): MateConf2
--# Requires(post): MateConf2
--#
--# schemas names are without path and suffix
--#
--#
--# %pre
--# %mateconf_schema_obsolete schema1
--# %mateconf_schema_prepare schema2 schema3
--#
--# %preun
--# %mateconf_schema_remove schema2 schema3
--#
--# %post
--# %mateconf_schema_upgrade schema2 schema3
--#
--# %files
--# %{_sysconfdir}/mateconf/schemas/schema2.schemas
--# %{_sysconfdir}/mateconf/schemas/schema3.schemas
--
--# Copy schemas from old package for later uninstall on upgrade
--%mateconf_schema_prepare() \
--if [ "$1" -gt 1 ] ; then \
-- rm -rf %{_localstatedir}/lib/rpm-state/mateconf/* \
-- for schema in %{*} ; do \
-- if test -f %{_sysconfdir}/mateconf/schemas/"$schema".schemas ; then \
-- cp -p %{_sysconfdir}/mateconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/mateconf/ || : \
-- fi \
-- done \
--fi \
--%{nil}
--
--# Macro to remove schemas. Not meant to be used publically
--%_do_mateconf_schema_remove() \
-- if test -f %{_sysconfdir}/mateconf/schemas/"$schema".schemas ; then \
-- export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
-- mateconftool-2 --makefile-uninstall-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
-- fi \
--%{nil}
--
--# Remove schemas unconditionally
--%mateconf_schema_obsolete() \
--for schema in %{*} ; do \
-- %_do_mateconf_schema_remove \
--done \
--%{nil}
--
--# Remove schemas on package removal (not upgrade)
--%mateconf_schema_remove() \
--if [ "$1" -eq 0 ] ; then \
-- for schema in %{*} ; do \
-- %_do_mateconf_schema_remove \
-- done \
--fi \
--%{nil}
--
--%mateconf_schema_upgrade() \
--for schema in %{*} ; do \
-- if test -f %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas ; then \
-- cmp --quiet %{_sysconfdir}/mateconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas \
-- if test $? != 0; then\
-- %_do_mateconf_schema_remove \
-- export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
-- mateconftool-2 --makefile-install-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
-- fi \
-- rm -f %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas \
-- else \
-- export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
-- mateconftool-2 --makefile-install-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
-- fi \
--done \
--%{nil}
+#
+# RPM macros for mateconf applications.
+#
+# (c) 2006-2007 SUSE LINUX
+# Author: Stanislav Brabec <sbrabec at suse.cz>
+# (c) 2009 Red Hat, Inc
+# Author: Toshio Kuratomi <toshio at fedoraproject.org>
+#
+# License: LGPLv2+
+#
+# Usage:
+#
+# Preamble:
+# Requires(pre): MateConf2
+# Requires(preun): MateConf2
+# Requires(post): MateConf2
+#
+# schemas names are without path and suffix
+#
+#
+# %pre
+# %mateconf_schema_obsolete schema1
+# %mateconf_schema_prepare schema2 schema3
+#
+# %preun
+# %mateconf_schema_remove schema2 schema3
+#
+# %post
+# %mateconf_schema_upgrade schema2 schema3
+#
+# %files
+# %{_sysconfdir}/mateconf/schemas/schema2.schemas
+# %{_sysconfdir}/mateconf/schemas/schema3.schemas
+
+# Copy schemas from old package for later uninstall on upgrade
+%mateconf_schema_prepare() \
+if [ "$1" -gt 1 ] ; then \
+ rm -rf %{_localstatedir}/lib/rpm-state/mateconf/* \
+ for schema in %{*} ; do \
+ if test -f %{_sysconfdir}/mateconf/schemas/"$schema".schemas ; then \
+ cp -p %{_sysconfdir}/mateconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/mateconf/ || : \
+ fi \
+ done \
+fi \
+%{nil}
+
+# Macro to remove schemas. Not meant to be used publically
+%_do_mateconf_schema_remove() \
+ if test -f %{_sysconfdir}/mateconf/schemas/"$schema".schemas ; then \
+ export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
+ mateconftool-2 --makefile-uninstall-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
+ fi \
+%{nil}
+
+# Remove schemas unconditionally
+%mateconf_schema_obsolete() \
+for schema in %{*} ; do \
+ %_do_mateconf_schema_remove \
+done \
+%{nil}
+
+# Remove schemas on package removal (not upgrade)
+%mateconf_schema_remove() \
+if [ "$1" -eq 0 ] ; then \
+ for schema in %{*} ; do \
+ %_do_mateconf_schema_remove \
+ done \
+fi \
+%{nil}
+
+%mateconf_schema_upgrade() \
+for schema in %{*} ; do \
+ if test -f %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas ; then \
+ cmp --quiet %{_sysconfdir}/mateconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas \
+ if test $? != 0; then\
+ %_do_mateconf_schema_remove \
+ export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
+ mateconftool-2 --makefile-install-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
+ fi \
+ rm -f %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas \
+ else \
+ export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
+ mateconftool-2 --makefile-install-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
+ fi \
+done \
+%{nil}
diff --git a/mate-conf.spec b/mate-conf.spec
index fa9ebc1..7192878 100644
--- a/mate-conf.spec
+++ b/mate-conf.spec
@@ -1,6 +1,6 @@
Name: mate-conf
Version: 1.4.0
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: MATE Desktop configuration tool
License: GPLv2+
URL: http://mate-desktop.org
@@ -13,10 +13,11 @@ Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
Source1: macros.mateconf
BuildRequires: desktop-file-utils polkit-devel libglade2-devel dbus-glib-devel gobject-introspection-devel libxml2-devel libxslt-devel mate-corba-devel glib2-devel gtk-doc openldap-devel gtk2-devel gobject-introspection-devel mate-common mate-doc-utils cairo-gobject-devel gtk3-devel
-Requires: dbus desktop-file-utils
+Requires: dbus
# for patch0
Requires: /usr/bin/killall
+# I removed this once, and it got re-added, please document why -- rex
Conflicts: mate-conf-dbus
Patch0: mate-conf-1.4.0-reload.patch
@@ -35,7 +36,7 @@ Development files for mate-conf
%package gtk
Summary: Graphical mate-conf utilities
Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description gtk
The mate-conf-gtk package contains graphical mate-conf utilities
@@ -47,6 +48,7 @@ which require GTK+.
%patch0 -p1 -b .reload
NOCONFIGURE=1 ./autogen.sh
+
%build
%configure --disable-static --enable-gtk --with-openldap --enable-defaults-service --enable-gtk --enable-gsettings-backend=yes --enable-introspection --enable-gtk-doc
@@ -60,6 +62,7 @@ make %{?_smp_mflags} V=1
%install
make install DESTDIR=%{buildroot}
+# prep macros.mateconf
mkdir -p %{buildroot}%{_sysconfdir}/mateconf/schemas
mkdir -p %{buildroot}%{_sysconfdir}/mateconf/mateconf.xml.system
mkdir -p %{buildroot}%{_sysconfdir}/rpm/
@@ -68,44 +71,25 @@ mkdir -p %{buildroot}%{_datadir}/MateConf/matesettings
install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/
+# unpackaged files
find %{buildroot} -name '*.la' -exec rm -rf {} ';'
-find %{buildroot} -name '*.a' -exec rm -rf {} ';'
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings
+mkdir -p %{buildroot}%{_datadir}/GConf/gsettings
+
+%find_lang %{name}
-%find_lang %name
%post
/sbin/ldconfig
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
if [ $1 -gt 1 ]; then
if ! fgrep -q 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
fi
fi
-%postun -p /sbin/ldconfig
-gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
-
-
-
-#desktop-file-validate %{buildroot}%{_datadir}/applications/mateconf-gsettings-data-convert.desktop
-#desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop
-
-#desktop-file-install \
-# --remove-category="MATE" \
-# --add-category="X-MATE" \
-# --delete-original \
-# --dir=%{buildroot}%{_datadir}/applications \
-#%{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop
-#
-#desktop-file-install \
-# --remove-category="MATE" \
-# --add-category="X-MATE" \
-# --delete-original \
-# --dir=%{buildroot}%{_datadir}/applications \
-#%{buildroot}%{_datadir}/applications/*.desktop
-
-%posttrans
+%postun
+/sbin/ldconfig
gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
%files -f %{name}.lang
@@ -117,6 +101,7 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
%dir %{_sysconfdir}/mateconf/mateconf.xml.mandatory
%dir %{_sysconfdir}/mateconf/mateconf.xml.system
%dir %{_sysconfdir}/mateconf/schemas
+%{_sysconfdir}/rpm/macros.mateconf
%{_sysconfdir}/mateconf/2/evoldap.conf
%{_sysconfdir}/xdg/autostart/mateconf-gsettings-data-convert.desktop
%{_mandir}/man1/*
@@ -125,38 +110,39 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
%{_bindir}/mateconf-merge-tree
%{_bindir}/mateconftool-2
%{_sysconfdir}/dbus-1/system.d/org.mate.MateConf.Defaults.conf
-%dir %{_libdir}/MateConf
-%dir %{_libdir}/MateConf/2
%dir %{_datadir}/sgml
-%{_datadir}/sgml/mateconf
+%{_datadir}/sgml/mateconf/
%{_libexecdir}/mateconf-defaults-mechanism
%{_libexecdir}/mateconf-sanity-check-2
%{_libexecdir}/mateconfd-2
-%{_libdir}/libmateconf-2.so.4
-%{_libdir}/libmateconf-2.so.4.1.5
-%{_libdir}/MateConf/2/*.so
+%{_libdir}/libmateconf-2.so.4*
+%{_libdir}/MateConf/
%{_libdir}/gio/modules/libgsettingsmateconfbackend.so
%{_libdir}/girepository-1.0/MateConf-2.0.typelib
-#%{_datadir}/applications/mateconf-gsettings-data-convert.desktop
%{_datadir}/dbus-1/services/org.mate.MateConf.service
%{_datadir}/dbus-1/system-services/org.mate.MateConf.Defaults.service
%{_datadir}/polkit-1/actions/org.mate.mateconf.defaults.policy
-%{_sysconfdir}/rpm/macros.mateconf
%{_datadir}/MateConf/schema/evoldap.schema
-%{_datadir}/gtk-doc/html/mateconf
%files gtk
%{_libexecdir}/mateconf-sanity-check-2
%files devel
-%{_datadir}/gtk-doc/html/mateconf
+%{_datadir}/gtk-doc/html/mateconf/
%{_libdir}/libmateconf-2.so
-%{_includedir}/mateconf
+%{_includedir}/mateconf/
%{_datadir}/gir-1.0/MateConf-2.0.gir
-%{_datadir}/aclocal/*.m4
-%{_libdir}/pkgconfig/*
+%{_datadir}/aclocal/mateconf-2.m4
+%{_libdir}/pkgconfig/mateconf-2.0.pc
+
%changelog
+* Wed Sep 26 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4.0-19
+- fix macros.mateconf
+- fix gio scriplets
+- simplify some dir/file ownership
+- drop Requires: desktop-file-utils
+
* Tue Sep 18 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-18
- Rebuild again.
More information about the scm-commits
mailing list