Merge branch 'master' into epel7
This commit is contained in:
Dan Mashal
commit
a81fea573b
|
|
@ -8,4 +8,7 @@
|
|||
/mate-settings-daemon-1.6.0.tar.xz
|
||||
/mate-settings-daemon-1.6.1.tar.xz
|
||||
/mate-settings-daemon-1.6.2.gitd2d3aa7.tar.xz
|
||||
/mate-settings-daemon-1.6.2.tar.xz
|
||||
/mate-settings-daemon-1.7.0.tar.xz
|
||||
/mate-settings-daemon-1.7.1.tar.xz
|
||||
/mate-settings-daemon-1.7.90.tar.xz
|
||||
/mate-settings-daemon-1.8.0.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,42 +1,34 @@
|
|||
%global _internal_version d2d3aa7
|
||||
|
||||
Name: mate-settings-daemon
|
||||
Version: 1.6.2
|
||||
#Release: 0.4.git%{_internal_version}%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Version: 1.8.0
|
||||
Release: 1%{?dist}
|
||||
Summary: MATE Desktop settings daemon
|
||||
License: GPLv2+
|
||||
URL: http://mate-desktop.org
|
||||
|
||||
Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
|
||||
Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
|
||||
|
||||
# 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
|
||||
#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
|
||||
|
||||
# fix rhbz (#1048409)
|
||||
%if 0%{?fedora} < 20
|
||||
Patch0: mate-settings-daemon_revert-thumbnailer-commit.patch
|
||||
%endif
|
||||
|
||||
Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
|
||||
# needed for xrandr capplet
|
||||
Requires: mate-control-center-filesystem
|
||||
|
||||
BuildRequires: dconf-devel
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: dconf-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: pulseaudio-libs-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: libXxf86misc-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libmatekbd-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libXxf86misc-devel
|
||||
BuildRequires: mate-common
|
||||
BuildRequires: mate-desktop-devel
|
||||
BuildRequires: mate-polkit-devel
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pulseaudio-libs-devel
|
||||
|
||||
Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
|
||||
# needed for xrandr capplet
|
||||
Requires: mate-control-center-filesystem
|
||||
|
||||
%description
|
||||
This package contains the daemon which is responsible for setting the
|
||||
|
|
@ -53,14 +45,7 @@ various parameters of a MATE session and the applications that run
|
|||
under it.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%if 0%{?fedora} < 20
|
||||
%patch0 -p1 -b .thumbnailer
|
||||
%endif
|
||||
|
||||
#%%setup -q -n %%{name}-%%{_internal_version}
|
||||
#NOCONFIGURE=1 ./autogen.sh
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
|
@ -75,7 +60,7 @@ under it.
|
|||
make %{?_smp_mflags} V=1
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install
|
||||
%{make_install}
|
||||
|
||||
find %{buildroot} -name '*.la' -exec rm -rf {} ';'
|
||||
|
||||
|
|
@ -84,7 +69,7 @@ rm -f %{buildroot}%{_datadir}/MateConf/gsettings/mate-settings-daemon.convert
|
|||
|
||||
desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
|
||||
|
||||
%find_lang %{name}
|
||||
%find_lang %{name} --with-gnome --all-name
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
|
@ -119,18 +104,27 @@ fi
|
|||
%{_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.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/mate-settings-daemon
|
||||
%{_libdir}/pkgconfig/mate-settings-daemon.pc
|
||||
|
||||
%changelog
|
||||
* Sat Jan 04 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-2
|
||||
- revert https://github.com/mate-desktop/mate-settings-daemon/commit/b4d8c8e
|
||||
- to fix rhbz (#1048409) thumbnailer issue for < f20
|
||||
* Wed Mar 05 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
|
||||
- Update to 1.8.0
|
||||
|
||||
* Fri Dec 20 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-1
|
||||
- update to 1.6.2 release
|
||||
* Tue Feb 18 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.90-1
|
||||
- update to 1.7.90
|
||||
- use --with-gnome --all-name for find locale
|
||||
- use modern 'make install' macro
|
||||
- add man dir
|
||||
|
||||
* Sun Feb 09 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.1-1
|
||||
- Update to 1.7.1
|
||||
|
||||
* Thu Dec 05 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.0-1
|
||||
- Update to 1.7.0
|
||||
|
||||
* Thu Oct 03 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-0.3.gitd2d3aa7
|
||||
- enable pulsaudio support
|
||||
|
|
|
|||
Loading…
Reference in New Issue