[mate-control-center] update to version 1.5.2

nmarques nmarques at fedoraproject.org
Fri Dec 21 01:47:48 UTC 2012


commit 87f5c84972a6b0e5c8c8026dea13673b21664cf0
Author: Nelson Marques <nmo.marques at gmail.com>
Date:   Fri Dec 21 01:47:26 2012 +0000

    update to version 1.5.2

 .gitignore               |    1 +
 mate-control-center.spec |   70 ++++++++++++++++++++++++++++++++++------------
 sources                  |    2 +-
 3 files changed, 54 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80814d6..f9c7279 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /mate-control-center-1.4.0.tar.xz
 /mate-control-center-1.5.0.tar.xz
 /mate-control-center-1.5.1.tar.xz
+/mate-control-center-1.5.2.tar.xz
diff --git a/mate-control-center.spec b/mate-control-center.spec
index d7c296d..40026b6 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,44 +1,61 @@
 Name:           mate-control-center
-Version:        1.5.1
+%define _name   libslab
+Version:        1.5.2
 Release:        1%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+Requires:       gsettings-desktop-schemas
 
-BuildRequires: pkgconfig(gtk+-2.0)
 BuildRequires: desktop-file-utils
 BuildRequires: icon-naming-utils
 BuildRequires: mate-common
-BuildRequires: pkgconfig(MateCORBA-2.0)
-BuildRequires: pkgconfig(mate-settings-daemon)
-BuildRequires: pkgconfig(mate-desktop-2.0)
-BuildRequires: pkgconfig(mate-doc-utils) 
-BuildRequires: pkgconfig(libmate-menu)
 BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(dconf)
+BuildRequires: pkgconfig(ice)
+BuildRequires: pkgconfig(libcanberra)
+BuildRequires: pkgconfig(libmate-menu)
 BuildRequires: pkgconfig(libmatekbd)
 BuildRequires: pkgconfig(libmatenotify)
+BuildRequires: pkgconfig(libmarco-private)
+BuildRequires: pkgconfig(librsvg-2.0)
 BuildRequires: pkgconfig(libxklavier)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+BuildRequires: pkgconfig(mate-settings-daemon)
+BuildRequires: pkgconfig(mate-desktop-2.0)
+BuildRequires: pkgconfig(mate-doc-utils) 
 BuildRequires: pkgconfig(nss)
-BuildRequires: pkgconfig(dconf)
 BuildRequires: pkgconfig(polkit-agent-1)
+BuildRequires: pkgconfig(sm)
 BuildRequires: pkgconfig(unique-1.0)
-BuildRequires: pkgconfig(libmarco-private)
-BuildRequires: pkgconfig(librsvg-2.0)
-BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(xscrnsaver)
 BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xscrnsaver)
 BuildRequires: pkgconfig(xxf86misc)
 BuildRequires: pkgconfig(xkbfile)
-BuildRequires: pkgconfig(libcanberra)
-BuildRequires: pkgconfig(sm)
-BuildRequires: pkgconfig(gsettings-desktop-schemas)
 
-Requires:       gsettings-desktop-schemas
+# sample code block for handling distributions which cant provide
+# pkgconfig() capabilities - according to Dan: %%{?fedora} < 17
+%if 0%{?fedora} < 17
+# BuildRequires: foobar-devel
+%else
+# BuildRequires: pkgconfig(foobar)
+%endif
 
 %description
 MATE Desktop Control Center
 
+
+%package -n %{_name}
+License:        LGPLv2+
+Summary:        MATE Desktop libslab port
+
+%description -n %{_name}
+This package provides libslab which is used in MATE control panel and in
+gnome-main-menu.
+
+
 %package devel
 Summary:        Development files for mate-settings-daemon
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -46,12 +63,13 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description devel
 Development files for mate-control-center
 
+
 %prep
 %setup -q
-NOCONFIGURE=1 ./autogen.sh
 
 
 %build
+NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static          \
            --disable-schemas-compile \
            --disable-update-mimedb   \
@@ -85,6 +103,7 @@ rm %{buildroot}%{_datadir}/applications/mimeinfo.cache
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
+%post -n %{_name} -p /sbin/ldconfig
 
 %postun
 /sbin/ldconfig
@@ -96,6 +115,8 @@ if [ $1 -eq 0 ] ; then
     /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
+%postun -n %{_name} -p /sbin/ldconfig
+
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
@@ -103,7 +124,7 @@ fi
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
-%{_sysconfdir}/xdg/menus/matecc.menu
+%config %{_sysconfdir}/xdg/menus/matecc.menu
 %{_bindir}/mate-*
 %{_libdir}/libmate-window-settings.so.*
 %{_libdir}/window-manager-settings/
@@ -121,14 +142,27 @@ fi
 %{_datadir}/omf/mate-control-center/
 %{_datadir}/polkit-1/actions/org.mate.randr.policy
 
+%files -n %{_name}
+%{_libdir}/libslab.so.*
+
 %files devel
 %{_includedir}/mate-window-settings-2.0/
 %{_libdir}/pkgconfig/mate-window-settings-2.0.pc
 %{_libdir}/libmate-window-settings.so
 %{_datadir}/pkgconfig/mate-default-applications.pc
 %{_datadir}/pkgconfig/mate-keybindings.pc
+# libslab
+%{_includedir}/libslab/
+%{_libdir}/libslab.so
+%{_libdir}/pkgconfig/libslab.pc
 
 %changelog
+* Fri Dec 21 2012 Nelson Marques <nmarques at fedoraproject.org> - 1.5.2-1
+- Update to version 1.5.2 so we can receive mate-panel 1.5.3
+- Remove dropped BRs: MateCORBA-2.0 
+- Split out libslab (now distributed)
+- Minor rework for readibility and ordered BuildRequires
+
 * Sun Nov 25 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-1
 - Bump to 1.5.1 release
 
diff --git a/sources b/sources
index 4dd393b..a81abdc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff8dbedc28b3f3ade078dc20de819d9f  mate-control-center-1.5.1.tar.xz
+265cff2fa1b3c1c4232bb1743d079c73  mate-control-center-1.5.2.tar.xz


More information about the scm-commits mailing list