Merge branch 'master' into f18
This commit is contained in:
commit
56b4205cb3
|
@ -75,6 +75,7 @@ fi
|
||||||
%posttrans
|
%posttrans
|
||||||
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
%install
|
%install
|
||||||
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
|
@ -84,6 +85,9 @@ find %{buildroot} -name '*.a' -exec rm -rf {} ';'
|
||||||
|
|
||||||
|
|
||||||
%files -f %{po_package}.lang
|
%files -f %{po_package}.lang
|
||||||
|
=======
|
||||||
|
%files %{name}.lang
|
||||||
|
>>>>>>> parent of 14c16b8... eek, fix typo
|
||||||
%doc AUTHORS COPYING README
|
%doc AUTHORS COPYING README
|
||||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
|
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
|
||||||
%config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas
|
%config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas
|
||||||
|
|
Loading…
Reference in New Issue