[mate-utils/f17: 3/3] Merge branch 'master' into f17

[Dan Mashal]

commit a3bd16d2d4ac86100f14327ea3f4dbb022f85a8b
Merge: ac1eb78 bfeff55
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Wed Dec 5 19:56:53 2012 -0800

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-utils.spec

 mate-utils.spec |  269 +++++++++++++++++++------------------------------------
 1 files changed, 93 insertions(+), 176 deletions(-)
---
diff --cc mate-utils.spec
index 3ca7237,548bd58..04222ba
--- a/mate-utils.spec
+++ b/mate-utils.spec
@@@ -57,20 -36,18 +36,17 @@@ Development files for mate-pane
  
  %prep
  %setup -q
- #sed -i -e 's at libmatepanelapplet-2.0@libmatepanelapplet-4.0 at g' configure.ac
  NOCONFIGURE=1 ./autogen.sh
  
 -
  %build
- %configure \
-         --disable-static \
-         --disable-scrollkeeper \
-         --disable-schemas-install
- #        --enable-gdict-applet=no
- 
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
- 
- make V=1 %{?_smp_mflags}
+ %configure                        \
+        --with-gnu-ld              \
+        --with-x                   \
+        --enable-gdict-applet=no   \
+        --disable-scrollkeeper     \
+        --disable-schemas-install
  
+ make %{?_smp_mflags} V=1
  
  %install
  export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@@ -184,52 -110,45 +109,44 @@@ f
  %{_bindir}/mate-panel-screenshot
  %{_bindir}/mate-screenshot
  %{_bindir}/mate-search-tool
- %{_bindir}/mate-disk-usage-analyzer
+ %{_bindir}/mate-system-log
+ %{_libdir}/libmatedict.so.*
  %{_datadir}/applications/mate-dictionary.desktop
+ %{_datadir}/applications/mate-disk-usage-analyzer.desktop
  %{_datadir}/applications/mate-screenshot.desktop
  %{_datadir}/applications/mate-search-tool.desktop
- %{_datadir}/applications/mate-disk-usage-analyzer.desktop
- %{_datadir}/mate-dict/
- %{_datadir}/mate-dictionary/
- %{_datadir}/mate-screenshot/
- %{_datadir}/mate-disk-usage-analyzer/
- %{_datadir}/pixmaps/mate-search-tool/
- %{_libexecdir}/mate-dictionary-applet
- %{_datadir}/mate-2.0/ui/MATE_DictionaryApplet.xml
- %{_libdir}/libmatedict.so.*
- %{_libdir}/matecomponent/servers/MATE_DictionaryApplet.server
- %{_mandir}/man1/mate-dictionary.1.*
- %{_mandir}/man1/mate-search-tool.1.*
- %{_mandir}/man1/mate-screenshot.1.*
- %{_mandir}/man1/mate-disk-usage-analyzer.1.*
- %{_datadir}/icons/mate/*/apps/baobab.*
- %{_datadir}/mate/help/mate-dictionary/
- %{_datadir}/mate/help/mate-disk-usage-analyzer/
- %{_datadir}/mate/help/mate-search-tool/
- 
+ %{_datadir}/applications/mate-system-log.desktop
+ %{_datadir}/icons/mate/24x24/apps/*.png
+ %{_datadir}/icons/mate/scalable/apps/*.svg
+ %{_datadir}/pixmaps/mate-search-tool
+ %{_datadir}/mate-dict
+ %{_datadir}/mate-dictionary
+ %{_datadir}/mate-disk-usage-analyzer
+ %{_datadir}/mate-screenshot
+ %{_datadir}/mate-utils
+ %{_datadir}/mate/help/mate-dictionary 
+ %{_datadir}/mate/help/mate-disk-usage-analyzer
+ %{_datadir}/mate/help/mate-search-tool
+ %{_datadir}/mate/help/mate-system-log
+ %{_datadir}/omf/mate-dictionary
+ %{_datadir}/omf/mate-disk-usage-analyzer
+ %{_datadir}/omf/mate-search-tool
+ %{_datadir}/omf/mate-system-log
  
  %files devel
+ %{_includedir}/mate-dict
  %{_libdir}/libmatedict.so
  %{_libdir}/pkgconfig/mate-dict.pc
- %{_includedir}/mate-dict/
  
  
- %files -n mate-system-log -f mate-system-log.lang
- %doc COPYING
- %{_bindir}/mate-system-log
- %{_sbindir}/mate-system-log
- %{_sysconfdir}/mateconf/schemas/mate-system-log.schemas
- %{_sysconfdir}/security/console.apps/mate-system-log
- %{_sysconfdir}/pam.d/mate-system-log
- %{_datadir}/mate-utils/
- %{_datadir}/applications/mate-system-log.desktop
- %{_datadir}/mate/help/mate-system-log/
- %{_mandir}/man1/mate-system-log.1.*
- 
+ %changelog
+ * Wed Dec 05 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.0-5
+ - Clean up spec file and fix package dependency conflicts created by move to 1.5
  
+ * Thu Nov 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-4
+ - rebuild for 1.5.0
  
- %changelog
  * Mon Nov 05 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-3
 -- drop gdict-applet till upstream fixes it
  - sort out lang file mess
  - link identical immages in help to save space
  - fix directory ownership of help files