Compare commits

...

29 Commits

Author SHA1 Message Date
raveit65 f61f534a40 update to 1.16.2 2017-03-26 16:04:50 +02:00
raveit65 2667ad9960 update to 1.16.1 2017-02-05 10:02:52 +01:00
raveit65 e05de66178 add priority symlinks for synaptics and evdev driver 2016-12-10 22:29:03 +01:00
raveit65 e9db25010e update to 1.16.0 2016-10-03 08:47:25 +02:00
raveit65 d29c87723d update to 1.14.1 release 2016-08-12 21:40:28 +02:00
raveit65 b560415d1f update to 1.14.0 release 2016-06-18 13:18:56 +02:00
Wolfgang Ulbrich 53ca5adea3 update to 1.12.1 release 2015-12-30 01:04:38 +01:00
Wolfgang Ulbrich 15f8422335 rebuild for 7.2 upgrade 2015-11-25 21:49:45 +01:00
raveit65 8184b33815 fix spec file 2015-08-31 17:44:38 +02:00
raveit65 01c16e938a update to 1.10.2 release 2015-08-31 17:40:22 +02:00
raveit65 16130483fd add BR libmatemixer 2015-08-08 14:58:53 +02:00
raveit65 4ec2db206a update to 1.10.1 release 2015-07-19 12:59:42 +02:00
raveit65 6a4ebf712b update to 1.8.3 release 2015-03-11 15:58:16 +01:00
raveit65 816ddbbdf6 add another upstream patches 2015-03-11 15:57:08 +01:00
raveit65 964d5719ed remove obsolete patch 2015-03-11 15:55:40 +01:00
raveit65 52d58cb8cf add some upstream patches 2015-03-11 15:54:09 +01:00
raveit65 f37645cce6 add missing require to cpp 2014-11-13 00:51:55 +01:00
raveit65 9ae307516c fix xrdb plugin (#1140329) 2014-11-12 23:45:14 +01:00
raveit65 5f04aa203e fix typo 2014-10-02 20:23:19 +02:00
raveit65 34f4d9252e add 1.8.2 release to spec file 2014-10-02 20:18:09 +02:00
raveit65 3889683721 add 1.8.2 release 2014-10-02 20:16:58 +02:00
raveit65 5e2e63789a add 1.8.1 release to spec file 2014-08-20 00:04:32 +02:00
raveit65 3ac8fd8b50 add 1.8.1 release 2014-08-20 00:02:52 +02:00
Dan Mashal 73eacc3ddd Update spec and bump release 2014-04-01 14:24:57 -07:00
Dan Mashal a81fea573b Merge branch 'master' into epel7 2014-03-18 01:44:24 -07:00
raveit65 ec0c59456c add mate-settings-daemon_revert-thumbnailer-commit.patch to spec file 2014-01-04 16:12:32 +01:00
raveit65 2b16385172 add mate-settings-daemon_revert-thumbnailer-commit.patch 2014-01-04 16:11:20 +01:00
raveit65 362699729b add 1.6.2 release to spec file 2013-12-20 20:35:12 +01:00
raveit65 307bac9169 add 1.6.2 release 2013-12-20 20:28:47 +01:00
4 changed files with 153 additions and 13 deletions

11
.gitignore vendored
View File

@ -12,3 +12,14 @@
/mate-settings-daemon-1.7.1.tar.xz
/mate-settings-daemon-1.7.90.tar.xz
/mate-settings-daemon-1.8.0.tar.xz
/mate-settings-daemon-1.8.1.tar.xz
/mate-settings-daemon-1.8.2.tar.xz
/mate-settings-daemon-1.8.3.tar.xz
/mate-settings-daemon-1.10.1.tar.xz
/mate-settings-daemon-1.10.2.tar.xz
/mate-settings-daemon-1.12.1.tar.xz
/mate-settings-daemon-1.14.0.tar.xz
/mate-settings-daemon-1.14.1.tar.xz
/mate-settings-daemon-1.16.0.tar.xz
/mate-settings-daemon-1.16.1.tar.xz
/mate-settings-daemon-1.16.2.tar.xz

View File

@ -1,15 +1,36 @@
# Conditional for release and snapshot builds. Uncomment for release-builds.
%global rel_build 1
# This is needed, because src-url contains branched part of versioning-scheme.
%global branch 1.16
# Settings used for build from snapshots.
%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
%{!?rel_build:%global commit_date 20141215}
%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
Name: mate-settings-daemon
Version: 1.8.0
Version: %{branch}.2
%if 0%{?rel_build}
Release: 1%{?dist}
%else
Release: 0.1%{?git_rel}%{?dist}
%endif
Summary: MATE Desktop settings daemon
License: GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
# for downloading the tarball use 'spectool -g -R mate-settings-daemon.spec'
# Source for release-builds.
%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
# Source for snapshot-builds.
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
# To generate tarball
# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
# fix rhbz (#1140329)
Patch0: mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
BuildRequires: dbus-glib-devel
BuildRequires: dconf-devel
@ -17,6 +38,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: libcanberra-devel
BuildRequires: libmatekbd-devel
BuildRequires: libmatemixer-devel
BuildRequires: libnotify-devel
BuildRequires: libSM-devel
BuildRequires: libXxf86misc-devel
@ -29,6 +51,16 @@ BuildRequires: pulseaudio-libs-devel
Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
# needed for xrandr capplet
Requires: mate-control-center-filesystem
# needed for xrdb fix
Requires: cpp
%ifnarch s390 s390x
# to be sure that mouse and touchpad settings are working with correct drivers
%if 0%{?fedora}
Requires: xorg-x11-drv-synaptics
Requires: xorg-x11-drv-evdev
%endif
%endif
%description
This package contains the daemon which is responsible for setting the
@ -45,7 +77,17 @@ various parameters of a MATE session and the applications that run
under it.
%prep
%setup -q
%setup -q
%patch0 -p1 -b .xrdb
%if 0%{?rel_build}
#NOCONFIGURE=1 ./autogen.sh
%else # 0%{?rel_build}
# for snapshots
# needed for git snapshots
NOCONFIGURE=1 ./autogen.sh
%endif # 0%{?rel_build}
%build
%configure \
@ -53,9 +95,9 @@ under it.
--disable-static \
--disable-schemas-compile \
--enable-polkit \
--disable-gstreamer \
--with-x \
--with-nssdb
--with-nssdb \
--with-gtk=2.0
make %{?_smp_mflags} V=1
@ -64,9 +106,6 @@ make %{?_smp_mflags} V=1
find %{buildroot} -name '*.la' -exec rm -rf {} ';'
# remove needless gsettings convert file
rm -f %{buildroot}%{_datadir}/MateConf/gsettings/mate-settings-daemon.convert
desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
%find_lang %{name} --with-gnome --all-name
@ -74,18 +113,30 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae
%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
/bin/touch --no-create %{_datadir}/hicolor/mate &> /dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%if 0%{?fedora}
/usr/bin/rm -f %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf
/usr/bin/rm -f %{_sysconfdir}/X11/xorg.conf.d/99-mate-evdev.conf
%endif
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%if 0%{?fedora}
mkdir -p %{_sysconfdir}/X11/xorg.conf.d/
/usr/bin/ln -sf %{_datadir}/X11/xorg.conf.d/50-synaptics.conf %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf &> /dev/null || :
/usr/bin/ln -sf %{_datadir}/X11/xorg.conf.d/10-evdev.conf %{_sysconfdir}/X11/xorg.conf.d/99-mate-evdev.conf &> /dev/null || :
%endif
%files -f %{name}.lang
@ -94,23 +145,89 @@ fi
%dir %{_sysconfdir}/mate-settings-daemon/xrandr
%config %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
%{_sysconfdir}/xrdb/
%if 0%{?fedora}
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-mate-evdev.conf
%endif
%{_libdir}/mate-settings-daemon
%{_libexecdir}/mate-settings-daemon
%{_libexecdir}/msd-datetime-mechanism
%{_libexecdir}/msd-locate-pointer
%{_datadir}/mate-control-center/keybindings/50-accessibility.xml
%{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
%{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
%{_datadir}/icons/mate/*/*/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/mate-settings-daemon
%{_datadir}/glib-2.0/schemas/org.mate.*.xml
%{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
%{_mandir}/man1/mate-settings-daemon.1.*
%{_mandir}/man1/*
%files devel
%{_includedir}/mate-settings-daemon
%{_libdir}/pkgconfig/mate-settings-daemon.pc
%changelog
* Sun Mar 26 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.2-1
- update to 1.16.2 release
- fixes rhbz (#1420709, #1383272)
* Sun Feb 05 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.1-1
- update to 1.16.1 release
* Sat Dec 10 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-2
- add priority symlinks for synaptics and evdev driver
* Sun Oct 02 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
- update to 1.16.0 release
* Fri Aug 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.1-1
- update to 1.14.1 release
* Sun Jun 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
- update to 1.14.0 release
* Sun Dec 27 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-1
- update to 1.12.1 release
* Wed Nov 25 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2-2
- rebuild for 7.2 upgrade
* Mon Aug 31 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2-1
- update to 1.10.2 release
- remove upstreamed patches
- add upstream touchpad improvement
* Sat Aug 08 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1-2
- fix non working audio keys
* Sat Jul 18 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1-1
- update to 1.10.1 release
- remove upstreamed patches
* Wed Mar 11 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.3.1
- update to 1.8.3 release
- fix rhbz (#1157698)
- add mate-settings-daemon_a11y-keyboard-crash.patch
* Wed Nov 12 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-3
- add missing require to cpp
* Wed Nov 12 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-2
- fix xrdb plugin (#1140329)
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-1
- update to 1.8.2 release
* Tue Aug 19 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.1-1
- update to 1.8.1
* Tue Apr 01 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-2
- Comment out hard requires on mate-control-center-filesystem due to build failures.
- Bump release and rebuild.
* Wed Mar 05 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
- Update to 1.8.0

View File

@ -0,0 +1,12 @@
diff -upr mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c
--- mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c 2014-11-12 23:17:45.461271000 +0100
+++ mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c 2014-11-12 23:18:28.705704971 +0100
@@ -430,7 +430,7 @@ apply_settings (MsdXrdbManager *manager,
mate_settings_profile_start (NULL);
- command = "xrdb -merge -quiet";
+ command = "xrdb -cpp /bin/cpp -merge -quiet";
string = g_string_sized_new (256);
append_theme_colors (style, string);

View File

@ -1 +1 @@
5a37759334596d97f9157c364a887d29 mate-settings-daemon-1.8.0.tar.xz
SHA512 (mate-settings-daemon-1.16.2.tar.xz) = e4b527791f65c500ac0b432744c3b128a6a438077261ee182993c82c175d165c2f67fa60620ac03c6f6f532ef6cb4a2a6df52164022a30015e7a071a03df043e