RPM Packaging: R14 updates

9 files changed, 74 insertions, 73 deletions

diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 2cfd123e8..2d3a653b3 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -164,20 +164,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdelibdir}/*.so
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - %{?version}-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6
 - Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - %{?version}-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index e86012b01..36323f4e2 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -141,6 +141,7 @@ packages based on them, like PyKDE.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch0 -p1 -b .ftbfs
 
+
 %build
 unset QTDIR QTINC QTLIB
 
@@ -171,8 +172,6 @@ echo yes | python ../configure.py \
 %__rm -rf %{?buildroot}
 
 
-
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial release for TDE R14, using 'tqt3' instead of 'qt3'
-
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index 1112dfbbb..b8bbfb5c8 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -14,19 +14,19 @@
 
 %define _docdir %{tde_datadir}/doc
 
-Name:		trinity-tqca-tls
-Version:	1.0
-Release:	3%{?dist}%{?_variant}
+Name:			trinity-tqca-tls
+Version:		1.0
+Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
 
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-License:	LGPLv2+
-Group:		Applications/Internet
+Summary:		TLS plugin for the TQt Cryptographic Architecture
+License:		LGPLv2+
+Group:			Applications/Internet
 
-URL:		http://delta.affinix.com/qca/
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:			http://delta.affinix.com/qca/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
@@ -79,6 +79,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %doc README COPYING
 %{_libdir}/tqt3/plugins/crypto/libqca-tls.so
 
+
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
 - Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 083cfcf91..1a0686928 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -117,7 +117,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
 - Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 9c7169d79..aa2813914 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -26,6 +26,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch1:		tqt3-14.0.0-shared_lib.patch
 # [tqt3] Fix FTBFS
 Patch2:		tqt3-14.0.0-fix_ftbfs.patch
+# [tqt3] Fix GLIB initialization
+Patch3:		tqt3-14.0.0-fix_glib_init.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
@@ -428,6 +430,7 @@ for the TQt 3 toolkit.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .sharedlibs
 %patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .glibinit
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
index d8cacece0..b6f168c63 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
@@ -16,7 +16,7 @@
 %define tde_mandir %{tde_datadir}/man
 %define tde_appdir %{tde_datadsir}/applications
 
-%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdeappdir %{tde_appdir}/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
@@ -26,7 +26,7 @@
 
 Name:		trinity-%{tdecomp}
 Summary:	Perl bindings for the TQt library
-Version:	14.0.0
+Version:	3.008
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 
 License:	GPLv2+
@@ -39,7 +39,7 @@ URL:		http://www.trinitydesktop.org/
 Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch0:		libtqt-perl-14.0.0-ftbfs.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
@@ -48,7 +48,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-libsmokeqt-devel
+BuildRequires:	trinity-libsmoketqt-devel >= %{tde_version}
 
 %description
 This module lets you use the TQt library from Perl.
@@ -78,7 +78,7 @@ It provides an object-oriented interface and is easy to use.
 %{perl_vendorarch}/TQt/properties.pm
 %{perl_vendorarch}/TQt/signals.pm
 %{perl_vendorarch}/TQt/slots.pm
-%{perl_vendorarch}/auto/TQt/TQt.so
+%{perl_vendorarch}/auto/TQt/
 %{_mandir}/man3/TQt.3pm.*
 
 ##########
@@ -90,7 +90,7 @@ It provides an object-oriented interface and is easy to use.
 ##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch0 -p1 -b .ftbfs
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
@@ -121,11 +121,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+%__rm -f %{buildroot}%{perl_archlib}/perllocal.pod
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %Changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.008-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index f15a9c263..d32a0bc25 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -26,7 +26,7 @@ BuildRequires:	autoconf automake libtool m4
 Name:			trinity-%{tde_pkg}
 Summary:		Internationalization support for Trinity
 Version:		14.0.0
-Release:		%{?!preversion:1}%{?preversion:_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 
 Vendor:			Trinity Project
 Packager:		Francois Andriot <francois.andriot@free.fr>
diff --git a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch
index 3619f122d..d066256cd 100644
--- a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch
+++ b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch
@@ -11,14 +11,14 @@
  my $qt_inc = "@qt_includes@";
  my $qt_lib = "@qt_libraries@";
  
---- trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/kde/Makefile.am.ORI	2013-07-02 21:30:55.952456509 +0200
-+++ trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/kde/Makefile.am	2013-07-02 21:31:07.962573744 +0200
+--- trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/tde/Makefile.am.ORI	2013-07-02 21:30:55.952456509 +0200
++++ trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/tde/Makefile.am	2013-07-02 21:31:07.962573744 +0200
 @@ -9,7 +9,7 @@
- libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
+ libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
  
  # the libraries to link against.
--libsmokekde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx
-+libsmokekde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx -lknewstuff -ltdemdi
+-libsmoketde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx
++libsmoketde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx -lknewstuff -ltdemdi
  
  x_sources =  x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
     x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index dc72026fe..873e4b0b7 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -184,8 +184,8 @@ Provides:	trinity-kdebindings = %{version}-%{release}
 
 # Metapackage requires
 Requires: trinity-tdebindings-java = %{version}-%{release}
-Requires: trinity-libsmokeqt1 = %{version}-%{release}
-Requires: trinity-libsmokekde1 = %{version}-%{release}
+Requires: trinity-libsmoketqt = %{version}-%{release}
+Requires: trinity-libsmoketde = %{version}-%{release}
 Requires: trinity-perl-dcop = %{version}-%{release}
 Requires: trinity-python-dcop = %{version}-%{release}
 Requires: trinity-libkjsembed1 = %{version}-%{release}
@@ -406,35 +406,41 @@ This package is part of the official TDE bindings module.
 
 ##########
 
-%package -n trinity-libsmokeqt1
+%package -n trinity-libsmoketqt
 Summary:	SMOKE Binding Library to Qt
 Group:		Environment/Libraries
 
-%description -n trinity-libsmokeqt1
+Obsoletes:	trinity-libsmokeqt1 < %{version}-%{release}
+Provides:	trinity-libsmokeqt1 = %{version}-%{release}
+
+%description -n trinity-libsmoketqt
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 Qt library.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokeqt1
+%files -n trinity-libsmoketqt
 %defattr(-,root,root,-)
-%{tde_libdir}/libsmokeqt.so.*
+%{tde_libdir}/libsmoketqt.so.*
 
-%post -n trinity-libsmokeqt1
+%post -n trinity-libsmoketqt
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokeqt1
+%postun -n trinity-libsmoketqt
 /sbin/ldconfig || :
 
 ##########
 
-%package -n trinity-libsmokeqt-devel
+%package -n trinity-libsmoketqt-devel
 Summary:	SMOKE Binding Library to Qt - Development Files
 Group:		Development/Libraries
-Requires:	trinity-libsmokeqt1 = %{version}-%{release}
+Requires:	trinity-libsmoketqt = %{version}-%{release}
+
+Obsoletes:	trinity-libsmokeqt-devel < %{version}-%{release}
+Provides:	trinity-libsmokeqt-devel = %{version}-%{release}
 
-%description -n trinity-libsmokeqt-devel
+%description -n trinity-libsmoketqt-devel
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 Qt library. This package contains the development files for the
@@ -445,49 +451,55 @@ package.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokeqt-devel
+%files -n trinity-libsmoketqt-devel
 %defattr(-,root,root,-)
 %{tde_tdeincludedir}/smoke.h
-%{tde_libdir}/libsmokeqt.so
-%{tde_libdir}/libsmokeqt.la
+%{tde_libdir}/libsmoketqt.so
+%{tde_libdir}/libsmoketqt.la
 
-%post -n trinity-libsmokeqt-devel
+%post -n trinity-libsmoketqt-devel
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokeqt-devel
+%postun -n trinity-libsmoketqt-devel
 /sbin/ldconfig || :
 
 ##########
 
-%package -n trinity-libsmokekde1
+%package -n trinity-libsmoketde
 Summary:	SMOKE Binding Library to TDE
 Group:		Environment/Libraries
 
-%description -n trinity-libsmokekde1
+Obsoletes:	trinity-libsmokekde1 < %{version}-%{release}
+Provides:	trinity-libsmokekde1 = %{version}-%{release}
+
+%description -n trinity-libsmoketde
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 TDE libraries.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokekde1
+%files -n trinity-libsmoketde
 %defattr(-,root,root,-)
-%{tde_libdir}/libsmokekde.so.*
+%{tde_libdir}/libsmoketde.so.*
 
-%post -n trinity-libsmokekde1
+%post -n trinity-libsmoketde
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokekde1
+%postun -n trinity-libsmoketde
 /sbin/ldconfig || :
 
 ##########
 
-%package -n trinity-libsmokekde-devel
+%package -n trinity-libsmoketde-devel
 Summary:	SMOKE Binding Library to TDE - Development Files
 Group:		Development/Libraries
-Requires:	trinity-libsmokekde1 = %{version}-%{release}
+Requires:	trinity-libsmoketde = %{version}-%{release}
+
+Obsoletes:	trinity-libsmokekde-devel < %{version}-%{release}
+Provides:	trinity-libsmokekde-devel = %{version}-%{release}
 
-%description -n trinity-libsmokekde-devel
+%description -n trinity-libsmoketde-devel
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 Qt and TDE libraries. This package contains the development files for
@@ -498,15 +510,15 @@ package.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokekde-devel
+%files -n trinity-libsmoketde-devel
 %defattr(-,root,root,-)
-%{tde_libdir}/libsmokekde.so
-%{tde_libdir}/libsmokekde.la
+%{tde_libdir}/libsmoketde.so
+%{tde_libdir}/libsmoketde.la
 
-%post -n trinity-libsmokekde-devel
+%post -n trinity-libsmoketde-devel
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokekde-devel
+%postun -n trinity-libsmoketde-devel
 /sbin/ldconfig || :
 
 ##########
@@ -941,7 +953,7 @@ Obsoletes:	trinity-kdebindings-devel < %{version}-%{release}
 Provides:	trinity-kdebindings-devel = %{version}-%{release}
 
 # Metapackage
-Requires:	trinity-libsmokeqt-devel = %{version}-%{release}
+Requires:	trinity-libsmoketqt-devel = %{version}-%{release}
 Requires:	trinity-libdcop3-java-devel = %{version}-%{release}
 Requires:	trinity-libsmokekde-devel = %{version}-%{release}
 Requires:	trinity-libkjsembed-devel = %{version}-%{release}