[mate-control-center/f18] add missing build requires

leigh123linux leigh123linux at fedoraproject.org
Tue Oct 16 12:02:01 UTC 2012 

commit 21f2ca2afe98a4ba148ba894f387b9c3349e0c8f
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 16 13:01:52 2012 +0100

    add missing build requires

 mate-control-center.spec |   86 +++++++++++++++++++++++++++++++---------------
 1 files changed, 58 insertions(+), 28 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index 811571b..126e069 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,14 +1,38 @@
-%define po_package %{name}
+Name:           mate-control-center
+Version:        1.4.0
+Release:        9%{?dist}
+Summary:        MATE Desktop control-center
+License:        LGPLv2+ and GPLv2+
+URL:            http://mate-desktop.org
+Source0:        http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+
+BuildRequires: gtk2-devel
+BuildRequires: desktop-file-utils
+BuildRequires: icon-naming-utils
+BuildRequires: mate-common
+BuildRequires: mate-conf-devel
+BuildRequires: mate-corba-devel
+BuildRequires: mate-settings-daemon-devel
+BuildRequires: mate-desktop-devel
+BuildRequires: mate-doc-utils
+BuildRequires: mate-menus-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: libmatekbd-devel
+BuildRequires: libmatenotify-devel
+BuildRequires: libxklavier-devel
+BuildRequires: nss-devel
+BuildRequires: polkit-devel
+BuildRequires: unique-devel
+BuildRequires: mate-window-manager-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libICE-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXext-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libxkbfile-devel
+BuildRequires: libcanberra-devel
+BuildRequires: libSM-devel
 
-Name:		mate-control-center
-Version:	1.4.0
-Release:	8%{?dist}
-Summary:	MATE Desktop control-center
-License:	LGPLv2+ and GPLv2+
-URL:		http://mate-desktop.org
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-BuildRequires:	gtk2-devel desktop-file-utils icon-naming-utils mate-common mate-conf-devel mate-corba-devel mate-settings-daemon-devel mate-desktop-devel mate-doc-utils mate-menus-devel dbus-glib-devel libmatekbd-devel libmatenotify-devel libxklavier-devel nss-devel polkit-devel unique-devel mate-window-manager-devel librsvg2-devel
 Requires(pre): mate-conf
 Requires(preun): mate-conf
 Requires(post): mate-conf
@@ -17,8 +41,8 @@ Requires(post): mate-conf
 MATE Desktop Control Center
 
 %package devel
-Summary:	Development files for mate-settings-daemon
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Summary:        Development files for mate-settings-daemon
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Development files for mate-control-center
@@ -29,14 +53,18 @@ NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure --disable-static --disable-update-mimedb --disable-schemas-install --disable-scrollkeeper
+%configure --disable-static \
+           --disable-update-mimedb \
+           --disable-schemas-install \
+           --disable-scrollkeeper
+
 make %{?_smp_mflags} V=1
 
 
 %install
 export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=%{buildroot} install
-%find_lang %{po_package}
+
 find %{buildroot} -name '*.la' -exec rm -rf {} ';'
 find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
@@ -47,6 +75,8 @@ desktop-file-install									\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/*.desktop
 
+%find_lang %{name}
+
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/at-properties.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/default-applications.desktop
@@ -60,27 +90,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mate-settings-mouse.d
 desktop-file-validate %{buildroot}%{_datadir}/applications/mate-theme-installer.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/matecc.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/window-properties.desktop
-desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-at-session.desktop
+
 
 %pre
-/sbin/ldconfig
-%mateconf_schema_prepare control-center
-%mateconf_schema_prepare fontilus
-%mateconf_schema_prepare mate-control-center
+%mateconf_schema_prepare control-center fontilus mate-control-center
 
 %preun
-%mateconf_schema_remove control-center
-%mateconf_schema_remove fontilus
-%mateconf_schema_remove mate-control-center
+%mateconf_schema_remove control-center fontilus mate-control-center
 
 %post
 /sbin/ldconfig
 /usr/bin/update-desktop-database &> /dev/null || :
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-%mateconf_schema_upgrade control-center
-%mateconf_schema_upgrade fontilus
-%mateconf_schema_upgrade mate-control-center
+%mateconf_schema_upgrade control-center fontilus mate-control-center
 
 %postun
 /sbin/ldconfig
@@ -94,7 +117,7 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
 
-%files -f %{po_package}.lang
+%files -f %{name}.lang
 %doc AUTHORS COPYING README
 %{_sysconfdir}/mateconf/schemas/control-center.schemas
 %{_sysconfdir}/mateconf/schemas/fontilus.schemas
@@ -114,9 +137,11 @@ fi
 %{_bindir}/mate-mouse-properties
 %{_bindir}/mate-network-properties
 %{_bindir}/mate-thumbnail-font
+%{_bindir}/mate-typing-monitor
 %{_bindir}/mate-window-properties
 %{_libdir}/libmate-window-settings.so.1
 %{_libdir}/libmate-window-settings.so.1.0.0
+%{_libdir}/window-manager-settings/
 %{_sbindir}/mate-display-properties-install-systemwide
 %{_datadir}/applications/at-properties.desktop
 %{_datadir}/applications/default-applications.desktop
@@ -139,23 +164,28 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/mate-network-properties.svg
 %{_datadir}/icons/hicolor/scalable/apps/mate-preferences-desktop-display.svg
+%{_datadir}/icons/hicolor/scalable/apps/mate-typing-monitor.svg
 %{_datadir}/mate-control-center/
 %{_datadir}/mate/cursor-fonts/*.pcf
 %{_datadir}/mate/help/mate-control-center/
 %{_datadir}/mime/packages/mate-theme-package.xml
 %{_datadir}/omf/mate-control-center/
 %{_datadir}/polkit-1/actions/org.mate.randr.policy
-%{_datadir}/mime/packages/mate-theme-package.xml
 
 %files devel
 %{_includedir}/mate-window-settings-2.0/
 %{_libdir}/pkgconfig/mate-window-settings-2.0.pc
-%{_libdir}/window-manager-settings/libmarco.so
 %{_libdir}/libmate-window-settings.so
 %{_datadir}/pkgconfig/mate-default-applications.pc
 %{_datadir}/pkgconfig/mate-keybindings.pc
 
 %changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-9
+- move unversioned .so back to main package
+- fix directory ownership
+- fix scriplets
+- add missing build requires
+
 * Wed Oct 03 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-8
 - Add disable-update-mimedb to configure flag and update files section

More information about the scm-commits mailing list