- pl, completed dependencies, resolved libexecdir vs plugindir mess

diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 1a58f2c20f1fb4d5e5ec4a4ae0327d75ed2f2d80..8d05233ad4c34255cb7c103b7b0cb7751df8f9cc 100644 (file)
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -1,8 +1,5 @@
-# TODO
-# - do implicit list of deps?
-#mate-settings-daemon-1.5.4-0.2.i686 marks libmatekbd-1.5.0-0.1.i686 (cap libmatekbd.so.4)
-
 Summary:       MATE Desktop settings daemon
+Summary(pl.UTF-8):     Demon ustawień środowiska MATE Desktop
 Name:          mate-settings-daemon
 Version:       1.6.2
 Release:       1
@@ -11,61 +8,91 @@ Group:               X11/Applications
 Source0:       http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 # Source0-md5: 551b2c2204b67ee2ffc9d49051d35efb
 URL:           http://wiki.mate-desktop.org/mate-settings-daemon
+BuildRequires: dbus-devel >= 1.1.2
 BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: dconf-devel >= 0.13
+BuildRequires: dconf-devel >= 0.13.4
+BuildRequires: fontconfig-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.17.3
+BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: gstreamer0.10-devel >= 0.10.1.2
+BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10.1.2
 BuildRequires: gtk+2-devel >= 2:2.24.0
 BuildRequires: intltool >= 0.37.1
+BuildRequires: libcanberra-gtk-devel
 BuildRequires: libmatekbd-devel >= 1.6.1
-BuildRequires: libnotify-devel
+BuildRequires: libnotify-devel >= 0.7.0
 BuildRequires: libxklavier-devel >= 5.0
 BuildRequires: mate-common
 BuildRequires: mate-desktop-devel >= 1.5.0
-BuildRequires: nss-devel
-#BuildRequires:        pkgconfig(clutter-gst-1.0)
-#BuildRequires:        pkgconfig(mate-conf)
+BuildRequires: nss-devel >= 3.11.2
+BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.97
 BuildRequires: pulseaudio-devel >= 0.9.16
 BuildRequires: rpmbuild(macros) >= 1.596
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xz
+Requires:      dbus >= 1.1.2
+Requires:      dbus-glib >= 0.74
+Requires:      dconf >= 0.13.4
 Requires:      glib2 >= 1:2.26.0
 Requires:      gsettings-desktop-schemas
+Requires:      gtk+2 >= 2:2.24.0
 Requires:      gtk-update-icon-cache
+Requires:      libmatekbd >= 1.6.1
+Requires:      libnotify >= 0.7.0
+Requires:      libxklavier >= 5.0
+Requires:      mate-desktop >= 1.5.0
 Requires:      mate-icon-theme
-Requires(post,postun): /sbin/ldconfig
+Requires:      polkit >= 0.97
+Requires:      pulseaudio-libs >= 0.9.16
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# makefiles and this spec gets confused if %{_libdir} == %{_libexecdir}
-%define                _libexecdir %{_libdir}/%{name}
+# NOTE: we must move %{_libexecdir}/mate-settings-daemon out of %{_libdir},
+# because it conflicts with %{_libdir}/mate-settings-daemon plugin dir
+# (not using %{_libdir}/%{name} not to mess programs with plugins)
+%define                _libexecdir %{_libdir}/mate-settings-daemon-exec
 
 %description
-MATE Desktop settings daemon
+MATE Desktop settings daemon. It's a fork of gnome-settings-daemon.
+
+%description -l pl.UTF-8
+Demon ustawień środowiska MATE Desktop. Jest to odgałęzienie pakietu
+gnome-settings-daemon.
 
 %package devel
 Summary:       Development files for mate-settings-daemon
+Summary(pl.UTF-8):     Pliki programistyczne pakietu mate-settings-daemon
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+# doesn't require base
+Requires:      dbus-devel >= 1.1.2
+Requires:      dbus-glib-devel >= 0.74
+Requires:      glib2-devel >= 1:2.26.0
 
 %description devel
-Development files for mate-settings-daemon
+Development files for mate-settings-daemon.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne pakietu mate-settings-daemon.
 
 %prep
 %setup -q
 
 %build
 %configure \
+       --libexecdir=%{_libdir}/mate-settings-daemon-exec \
+       --enable-gstreamer \
+       --enable-polkit \
+       --disable-schemas-compile \
        --disable-silent-rules \
        --disable-static \
-       --with-x  \
-       --enable-gstreamer  \
-       --enable-polkit  \
-       --disable-schemas-compile  \
-       --with-gnu-ld  \
-       --with-x  \
-       --with-nssdb  \
+       --with-gnu-ld \
+       --with-nssdb \
+       --with-x
 
 %{__make}
 
@@ -74,23 +101,21 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install -j1 \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
 # mate < 1.5 did not exist in pld, avoid dependency on mate-conf
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-settings-daemon.convert
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
-
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %update_icon_cache mate
 %glib_compile_schemas
 
 %postun
-/sbin/ldconfig
 %update_icon_cache mate
 if [ "$1" -eq 0 ]; then
        %glib_compile_schemas
@@ -98,22 +123,28 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README
-/etc/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
-%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
-%{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
-%{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
-%{_iconsdir}/mate/*/*/*.*
-%{_datadir}/mate-settings-daemon
-%{_datadir}/glib-2.0/schemas/org.mate.*.xml
-%{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
-
+%doc AUTHORS ChangeLog NEWS README
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/mate-settings-daemon
 %attr(755,root,root) %{_libexecdir}/msd-datetime-mechanism
 %attr(755,root,root) %{_libexecdir}/msd-locate-pointer
-%attr(755,root,root) %{_libexecdir}/*.so
-%{_libexecdir}/*-plugin
+%dir %{_libdir}/mate-settings-daemon
+%attr(755,root,root) %{_libdir}/mate-settings-daemon/*.so
+%{_libdir}/mate-settings-daemon/*.mate-settings-plugin
+%{_datadir}/mate-settings-daemon
+%{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
+%{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
+%{_datadir}/glib-2.0/schemas/org.mate.applications-at.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.font-rendering.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.keybindings.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-smartcard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-touchpad.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.*.gschema.xml
+%{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
+/etc/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
+%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
+%{_iconsdir}/mate/*/actions/touchpad-*.*
+%{_iconsdir}/mate/*/apps/msd-xrandr.*
 
 %files devel
 %defattr(644,root,root,755)