RPM packaging: update tdebindings

3 files changed, 47 insertions, 16 deletions

diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
index 619a447c2..843c0e282 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -22,6 +22,7 @@
 %define tde_datadir %{tde_prefix}/share
 %define _docdir %{tde_docdir}
 %define tde_docdir %{tde_datadir}/doc
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_includedir %{tde_prefix}/include
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -75,6 +76,8 @@ This package installs the Trinity directory structure.
 %dir %{tde_tdeincludedir}
 
 %dir %{tde_libdir}
+%dir %{tde_libdir}/java
+%dir %{tde_libdir}/jni
 %dir %{tde_libdir}/pkgconfig
 %dir %{tde_tdelibdir}
 
@@ -104,6 +107,8 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/locale/en_US
 %dir %{tde_datadir}/locale/l10n
 %dir %{tde_datadir}/locale/l10n/*
+%dir %{tde_datadir}/man
+%dir %{tde_datadir}/man/*
 %dir %{tde_datadir}/mimelnk
 %dir %{tde_datadir}/mimelnk/*
 %dir %{tde_datadir}/services
@@ -155,6 +160,8 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/man
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man3
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
@@ -204,6 +211,8 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdeincludedir}
 
 %__install -d -m 755 %{?buildroot}%{tde_libdir}
+%__install -d -m 755 %{?buildroot}%{tde_libdir}/java
+%__install -d -m 755 %{?buildroot}%{tde_libdir}/jni
 %__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig
 %__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
 
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
index 64fc09820..ba0d3f189 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
@@ -22,6 +22,7 @@
 %define tde_datadir %{tde_prefix}/share
 %define _docdir %{tde_docdir}
 %define tde_docdir %{tde_datadir}/doc
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_includedir %{tde_prefix}/include
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -63,6 +64,7 @@ This package installs the Trinity directory structure.
 
 %dir %{tde_datadir}
 %dir %{tde_datadir}/config
+%dir %{tde_datadir}/config/magic
 
 %dir %{tde_docdir}
 %dir %{tde_tdedocdir}
@@ -74,6 +76,8 @@ This package installs the Trinity directory structure.
 %dir %{tde_tdeincludedir}
 
 %dir %{tde_libdir}
+%dir %{tde_libdir}/java
+%dir %{tde_libdir}/jni
 %dir %{tde_libdir}/pkgconfig
 %dir %{tde_tdelibdir}
 
@@ -84,7 +88,7 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/applnk/*
 %dir %{tde_datadir}/applnk/*/*
 %dir %{tde_datadir}/apps
-%dir %{tde_datadir}/apps/plugin
+%dir %{tde_datadir}/apps/*
 %dir %{tde_datadir}/cmake
 %dir %{tde_datadir}/config.kcfg
 %dir %{tde_datadir}/autostart
@@ -96,10 +100,15 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/icons/hicolor
 %dir %{tde_datadir}/icons/hicolor/*
 %dir %{tde_datadir}/icons/hicolor/*/*
+%dir %{tde_datadir}/icons/locolor
+%dir %{tde_datadir}/icons/locolor/*
+%dir %{tde_datadir}/icons/locolor/*/*
 %dir %{tde_datadir}/locale
 %dir %{tde_datadir}/locale/en_US
 %dir %{tde_datadir}/locale/l10n
 %dir %{tde_datadir}/locale/l10n/*
+%dir %{tde_datadir}/man
+%dir %{tde_datadir}/man/*
 %dir %{tde_datadir}/mimelnk
 %dir %{tde_datadir}/mimelnk/*
 %dir %{tde_datadir}/services
@@ -141,18 +150,25 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Utilities
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/man
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man3
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/fonts
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/interface
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/media
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message
@@ -169,7 +185,7 @@ This package installs the Trinity directory structure.
 
 # Create icons directories
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/icons
-for t in crystalsvg hicolor ; do
+for t in crystalsvg hicolor locolor ; do
   %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}"
   %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable"
   for i in {16,22,32,48,64,128} ; do
@@ -177,7 +193,7 @@ for t in crystalsvg hicolor ; do
   done
   
   # Create subdirectories
-  for r in actions apps devices mimetypes places ; do
+  for r in actions apps categories devices mimetypes places ; do
     %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}"
     for i in {16,22,32,48,64,128} ; do
       %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}/${r}"
@@ -195,13 +211,11 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdeincludedir}
 
 %__install -d -m 755 %{?buildroot}%{tde_libdir}
+%__install -d -m 755 %{?buildroot}%{tde_libdir}/java
+%__install -d -m 755 %{?buildroot}%{tde_libdir}/jni
 %__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig
 %__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
 
-%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor
-%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32
-%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
-
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
 
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index 7293fd639..d7610f5a5 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -119,7 +119,12 @@ BuildRequires: mozilla-xulrunner20-devel
 BuildRequires:	openssl-devel
 
 # GTK1 support
-%if 0%{?fedora} || 0%{?with_rhel} && 0%{?with_gtk1}
+%if 0%{?fedora}
+%define with_gtk1 1
+BuildRequires: glib-devel
+BuildRequires: gtk+-devel
+%endif
+%if 0%{?with_rhel} && 0%{?with_gtk1}
 %define with_gtk1 1
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
@@ -289,8 +294,7 @@ This package is part of the official TDE bindings module.
 
 %files -n trinity-libdcop3-java
 %defattr(-,root,root,-)
-#%{tde_datadir}/java/dcopjava*.jar
-%{tde_libdir}/java/org/*/DCOP/*.class
+%{tde_libdir}/java/org/
 
 ##########
 
@@ -586,9 +590,9 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
 
 %files -n trinity-perl-dcop
 %defattr(-,root,root,-)
-%{perl_vendorarch}/auto/DCOP/*
+%{perl_vendorarch}/auto/DCOP/
 %{perl_vendorarch}/DCOP.pm
-%{perl_vendorarch}/DCOP/*
+%{perl_vendorarch}/DCOP/
 %doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
 %{tde_mandir}/man3/DCOP.3pm*
 
@@ -639,15 +643,17 @@ This package is part of the official TDE bindings module.
 %{tde_tdelibdir}/libfileitemplugin.la
 %{tde_tdelibdir}/libfileitemplugin.so
 %{tde_datadir}/services/tdefileitem_plugin.desktop
-%{tde_datadir}/apps/kjsembed/cmdline.js
+%{tde_datadir}/apps/kjsembed/
 %{tde_datadir}/servicetypes/binding_type.desktop
 %{tde_bindir}/embedjs
-%{tde_datadir}/apps/embedjs/embedjsui.rc
+%{tde_datadir}/apps/embedjs/
 %{tde_tdeappdir}/embedjs.desktop
 %{tde_datadir}/icons/hicolor/16x16/apps/embedjs.png
 %{tde_datadir}/icons/hicolor/32x32/apps/embedjs.png
 %{tde_tdelibdir}/libjavascript.la
 %{tde_tdelibdir}/libjavascript.so
+%dir %{tde_datadir}/apps/kate
+%dir %{tde_datadir}/apps/kate/scripts
 %{tde_datadir}/apps/kate/scripts/swaptabs.js
 %{tde_datadir}/apps/kate/scripts/swaptabs.ui
 %{tde_datadir}/apps/kate/scripts/swaptabs.desktop
@@ -689,7 +695,7 @@ This package is part of the official TDE bindings module.
 %{tde_tdeincludedir}/kjsembed/
 %{tde_libdir}/libkjsembed.so
 %{tde_libdir}/libkjsembed.la
-%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%{tde_docdir}/trinity-libkjsembed-devel/
 
 %post -n trinity-libkjsembed-devel
 /sbin/ldconfig || :
@@ -767,6 +773,7 @@ This package is part of the official TDE bindings module.
 %{tde_bindir}/krubyinit
 %{tde_bindir}/rbtdeconfig_compiler
 %{ruby_rubylibdir}/Korundum.rb
+%dir %{ruby_rubylibdir}/TDE
 %{ruby_rubylibdir}/TDE/korundum.rb
 %{ruby_arch}/korundum.la
 %{ruby_arch}/korundum.so*
@@ -800,6 +807,7 @@ This package is part of the official TDE bindings module.
 %{tde_bindir}/rbqtapi
 %{tde_bindir}/rbuic
 %{tde_bindir}/qtrubyinit
+%dir %{ruby_rubylibdir}/Qt
 %{ruby_rubylibdir}/Qt/qtruby.rb
 %{ruby_rubylibdir}/Qt.rb
 %{ruby_arch}/qtruby.so*
@@ -1159,7 +1167,7 @@ if [ -d "%{buildroot}%{_mandir}/man3" ]; then
   rm -rf %{buildroot}%{_mandir}
 fi
 
-# Move embedjs.desktop to correct location
+# Move 'embedjs.desktop' to correct location
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
 %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"