Branch: master

846cd136 2014-11-08 06:35:32 François Andriot
RPM packaging: update tdebindings
M redhat/tdebindings/tdebindings-14.0.0.spec
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index cf0303c..9060e0f 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -124,7 +124,7 @@
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
 %endif
-%if 0%{?with_rhel} && 0%{?with_gtk1}
+%if 0%{?rhel} == 5
 %define with_gtk1 1
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
@@ -245,7 +245,7 @@
 Requires: trinity-tdebindings-java = %{version}-%{release}
 Requires: trinity-libsmoketqt = %{version}-%{release}
 Requires: trinity-libsmoketde = %{version}-%{release}
-Requires: trinity-perl-dcop = %{version}-%{release}
+Requires: perl-dcop = %{version}-%{release}
 Requires: trinity-python-dcop = %{version}-%{release}
 Requires: trinity-libkjsembed1 = %{version}-%{release}
 Requires: trinity-kjscmd = %{version}-%{release}
@@ -258,12 +258,13 @@
 TDE/DCOP bindings to non-C++ languages
 
 %files
+%defattr(-,root,root,-)
 
 ##########
 
 %package java
 Summary:	TDE Java bindings metapackage [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	trinity-libdcop3-java = %{version}-%{release}
 Requires:	trinity-libdcop3-jni = %{version}-%{release}
 Requires:	trinity-libqt3-java = %{version}-%{release}
@@ -284,7 +285,7 @@
 
 %package -n trinity-libdcop3-java
 Summary:	DCOP bindings for Java [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 Requires:	trinity-libdcop3-jni = %{version}-%{release}
 
@@ -303,7 +304,7 @@
 
 %package -n trinity-libdcop3-java-devel
 Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
-Group:		Development/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libdcop3-java = %{version}-%{release}
 
 %description -n trinity-libdcop3-java-devel
@@ -322,7 +323,7 @@
 
 %package -n trinity-libdcop3-jni
 Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libdcop3-jni
 This package contains the shared libraries and scripts necessary to
@@ -347,7 +348,7 @@
 
 %package -n trinity-libqt3-java
 Summary:	Java bindings for Qt [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	trinity-libdcop3-jni = %{version}-%{release}
 Requires:	trinity-libqt3-jni = %{version}-%{release}
 Requires:	trinity-juic = %{version}-%{release}
@@ -371,7 +372,7 @@
 
 %package -n trinity-libqt3-jni
 Summary:	Java bindings for Qt ( Native libraries ) [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libqt3-jni
 This package contains the shared libraries necessary to run Java
@@ -388,11 +389,17 @@
 %{tde_libdir}/jni/libqtjava.so.*
 %doc qtjava/ChangeLog
 
+%post -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
+%postun -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
 ##########
 
 %package -n trinity-libqt3-jni-devel
 Summary:	Development files fo Java bindings for Qt ( Native libraries ) [Trinity]
-Group:		Development/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libqt3-jni = %{version}-%{release}
 
 %description -n trinity-libqt3-jni-devel
@@ -408,8 +415,8 @@
 ##########
 
 %package -n trinity-libtrinity-java
-Summary:	tdelibs bindings for Java [Trinity]
-Group:		Environment/Libraries
+Summary:	Tdelibs bindings for Java [Trinity]
+Group:		System/Libraries
 
 Requires:	trinity-libtrinity-jni = %{version}-%{release}
 
@@ -430,8 +437,8 @@
 ##########
 
 %package -n trinity-libtrinity-jni
-Summary:	tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		Environment/Libraries
+Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
+Group:		System/Libraries
 
 %description -n trinity-libtrinity-jni
 This package contains the shared libraries necessary to run Java
@@ -450,7 +457,7 @@
 
 %package -n trinity-libtrinity-jni-devel
 Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		Development/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libtrinity-jni = %{version}-%{release}
 
 %description -n trinity-libtrinity-jni-devel
@@ -466,7 +473,7 @@
 
 %package -n trinity-libsmoketqt
 Summary:	SMOKE Binding Library to Qt
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 Obsoletes:	trinity-libsmokeqt1 < %{version}-%{release}
 Provides:	trinity-libsmokeqt1 = %{version}-%{release}
@@ -492,7 +499,7 @@
 
 %package -n trinity-libsmoketqt-devel
 Summary:	SMOKE Binding Library to TQt - Development Files
-Group:		Development/Libraries
+Group:		Development/Languages/Other
 Requires:	trinity-libsmoketqt = %{version}-%{release}
 
 Obsoletes:	trinity-libsmokeqt-devel < %{version}-%{release}
@@ -525,7 +532,7 @@
 
 %package -n trinity-libsmoketde
 Summary:	SMOKE Binding Library to TDE
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 Obsoletes:	trinity-libsmokekde1 < %{version}-%{release}
 Provides:	trinity-libsmokekde1 = %{version}-%{release}
@@ -551,7 +558,7 @@
 
 %package -n trinity-libsmoketde-devel
 Summary:	SMOKE Binding Library to TDE - Development Files
-Group:		Development/Libraries
+Group:		Development/Languages/Other
 Requires:	trinity-libsmoketde = %{version}-%{release}
 
 Obsoletes:	trinity-libsmokekde-devel < %{version}-%{release}
@@ -581,17 +588,25 @@
 
 ##########
 
-%package -n trinity-perl-dcop
+%package -n perl-dcop
 Summary:	DCOP Bindings for Perl 
-Group:		Development/Libraries/Perl
+Group:		System/Libraries
+%if 0%{?suse_version}
+Requires:	perl-base
+%else
+Requires:	perl
+%endif
 
 Obsoletes:	trinity-kdebindings-dcopperl < %{version}-%{release}
 Provides:	trinity-kdebindings-dcopperl = %{version}-%{release}
 
-%description -n trinity-perl-dcop
+Obsoletes:	trinity-perl-dcop < %{version}-%{release}
+Provides:	trinity-perl-dcop = %{version}-%{release}
+
+%description -n perl-dcop
 Perl bindings to the DCOP interprocess communication protocol used by TDE
 
-%files -n trinity-perl-dcop
+%files -n perl-dcop
 %defattr(-,root,root,-)
 %{perl_vendorarch}/auto/DCOP/
 %{perl_vendorarch}/DCOP.pm
@@ -603,9 +618,8 @@
 
 %package -n trinity-python-dcop
 Summary:	DCOP bindings for Python
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	python
-#Provides:	%{name}-dcoppython = %{version}-%{release}
 
 %description -n trinity-python-dcop
 This package contains the shared libraries necessary to run and
@@ -625,7 +639,7 @@
 
 %package -n trinity-libkjsembed1
 Summary:	Embedded JavaScript library
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libkjsembed1
 This package contains the shared libraries necessary to run programs
@@ -679,7 +693,7 @@
 
 %package -n trinity-libkjsembed-devel
 Summary:	Embedded JavaScript library (Development files)
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkjsembed1 = %{version}-%{release}
 
 %description -n trinity-libkjsembed-devel
@@ -710,7 +724,7 @@
 
 %package -n trinity-kjscmd
 Summary:	A script interpreter using the TDE JavaScript library
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-kjscmd
 This package contains the kjscmd program, which is a standalone
@@ -736,7 +750,7 @@
 
 %package -n trinity-juic
 Summary:	The Qt Java UI Compiler
-Group:		Environment/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libqt3-java = %{version}-%{release}
 
 %description -n trinity-juic
@@ -757,7 +771,7 @@
 
 %package -n trinity-libkorundum0-ruby
 Summary:	TDE bindings for Ruby [Trinity]
-Group:		Environment/Libraries
 ** Diff limit reached (max: 250 lines) **