rpms
/
mate-settings-daemon
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "eek, fix typo" 

This reverts commit 14c16b81b9.

Conflicts:
	mate-settings-daemon.spec
This commit is contained in:
dmashal 2012-09-28 14:16:07 -07:00
parent 5795ffd94f
commit 66eb65bb74
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mate-settings-daemon.spec
View File

@ -74,6 +74,7 @@ fi
%posttrans
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
<<<<<<< HEAD
%install
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=%{buildroot} install
@ -83,6 +84,9 @@ find %{buildroot} -name '*.a' -exec rm -rf {} ';'
%files -f %{po_package}.lang
=======
%files %{name}.lang
>>>>>>> parent of 14c16b8... eek, fix typo
%doc AUTHORS COPYING README
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
%config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas