RPM Packaging: more updates

6 files changed, 199 insertions, 5 deletions

diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..8c4b63482
--- /dev/null
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch
@@ -0,0 +1,10 @@
+--- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.ORI	2013-07-07 15:07:12.912770044 +0200
++++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am	2013-07-07 15:11:43.224706604 +0200
+@@ -55,6 +55,6 @@
+ libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
+ libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
+ 
+-libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD)
++libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) $(LIB_QT) $(LIB_TDEUI)
+ 
+ libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch
new file mode 100644
index 000000000..ce8bffee9
--- /dev/null
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch
@@ -0,0 +1,11 @@
+--- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am	2013-07-07 15:16:58.922069997 +0200
++++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.libsuffix	2013-07-07 15:23:35.272293968 +0200
+@@ -36,7 +36,7 @@
+ 	$(srcdir)/tdegtk-baseengine.cpp \
+ 	$(srcdir)/tdegtk-theme.cpp
+ 
+-enginedir = $(GTK3_PREFIX)/lib/gtk-3.0/$(GTK3_VERSION)/theming-engines
++enginedir = $(GTK3_PREFIX)/lib64/gtk-3.0/$(GTK3_VERSION)/theming-engines
+ engine_LTLIBRARIES = libtdegtk.la
+ 
+ libtdegtk_la_SOURCES = $(source_h) $(source_c)
diff --git a/redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch b/redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..789918cdc
--- /dev/null
+++ b/redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch
@@ -0,0 +1,11 @@
+--- trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am.ORI	2013-07-07 13:17:16.270257111 +0200
++++ trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am	2013-07-07 13:17:41.911536825 +0200
+@@ -24,7 +24,7 @@
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO)
++kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = setupdlg.h kbiff.h kbiffmonitor.h notify.h kbiffurl.h \
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec
new file mode 100644
index 000000000..a3553ff45
--- /dev/null
+++ b/redhat/applications/kdbg/kdbg-14.0.0.spec
@@ -0,0 +1,152 @@
+# Default version for this component
+%define tde_pkg kdbg
+%define tde_version 14.0.0
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		graphical debugger interface [Trinity]
+Version:		2.2.2
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source0:		kdbg-master.tar.gz
+Source1:		admin-master.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+an intuitive interface for setting breakpoints, inspecting variables,
+stepping through code and much more.  KDbg requires TDE but you can of
+course debug any program.
+
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with xsldbg.  For this the package kxsldbg must be installed.
+
+Features include the following:
+* Inspection of variable values in a tree structure.
+* Direct member: For certain compound data types the most important
+  member values are displayed next to the variable name, so that it is
+  not necessary to expand the subtree of that variable in order to see
+  the member value.  KDbg can also display Qt's QString values, which
+  are Unicode strings.
+* Debugger at your finger tips: The basic debugger functions (step,
+  next, run, finish, until, set/clear/enable/disable breakpoint) are
+  bound to function keys F5 through F10.  Quick and easy.
+* View source code, search text, set program arguments and environment
+  variables, display arbitrary expressions.
+* Debugging of core dumps, attaching to running processes is possible.
+* Conditional breakpoints.
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+##########
+
+%prep
+#setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%setup -q -a 1 -n kdbg-master
+rmdir admin
+mv admin-master admin
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  --docdir=%{tde_tdedocdir} \
+  --libdir=%{tde_libdir} \
+  --disable-rpath
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || :
+
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || :
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kdbg
+%{tde_tdeappdir}/kdbg.desktop
+%{tde_datadir}/apps/kdbg/
+%{tde_datadir}/config/kdbgrc
+%lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
+%lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
+%{tde_datadir}/icons/hicolor/*/apps/kdbg.png
+%{tde_datadir}/icons/locolor/*/apps/kdbg.png
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.2-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/knetworkmanager9/knetworkmanager9-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 6dbe572f5..ed472f8f4 100644
--- a/redhat/applications/knetworkmanager9/knetworkmanager9-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -1,5 +1,5 @@
 # Default version for this component
-%define tde_pkg knetworkmanager9
+%define tde_pkg tdenetworkmanager
 %define tde_version 14.0.0
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -32,7 +32,8 @@ Summary:		Trinity applet for Network Manager
 
 Group:			Applications/Internet
 License:		GPLv2+
-URL:			http://en.opensuse.org/Projects/KNetworkManager
+#URL:			http://en.opensuse.org/Projects/KNetworkManager
+URL:			http://www.trinitydesktop.org/
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
@@ -44,6 +45,10 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+
+Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
+Provides:		trinity-knetworkmanager = %{version}-%{release}
+
 %if 0%{?rhel} || 0%{?fedora}
 Requires:		NetworkManager-gnome
 %else
diff --git a/redhat/applications/kpowersave-nohal/kpowersave-nohal-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index c32f525e0..070ee3021 100644
--- a/redhat/applications/kpowersave-nohal/kpowersave-nohal-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -1,5 +1,5 @@
 # Default version for this component
-%define tdecomp kpowersave-nohal
+%define tdecomp tdepowersave
 %define tde_version 14.0.0
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -48,9 +48,11 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+Obsoletes:		trinity-kpowersave < %{version}-%{release}
+Provides:		trinity-kpowersave = %{version}-%{release}
 
 %description
-KPowersave is a TDE systray applet which allows to control the power 
+TDEPowersave is a TDE systray applet which allows to control the power 
 management settings and policies of your computer.
 
 Current feature list:
@@ -87,6 +89,7 @@ settings for:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
+
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
@@ -125,6 +128,7 @@ update-desktop-database %{tde_appdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
+
 %postun
 update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
@@ -147,6 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/autostart/kpowersave-autostart.desktop
 %{tde_datadir}/config/kpowersaverc
 
+
 %changelog
 * Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5
 - Initial release for TDE 14.0.0
@@ -155,7 +160,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 - Initial release for TDE 3.5.13.2
 
 * Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
 
 * Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
 - Add missing /sbin/ldconfig