Branch: master

d44674e4 2014-06-12 15:42:13 François Andriot
RPM packaging: update packages
A redhat/extras/knoda/trinity-knoda.spec
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdelibs/tdelibs-14.0.0.spec
R redhat/applications/knoda/trinity-knoda.spec
R redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch
R redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch
R redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch
R redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch
diff --git a/redhat/applications/knoda/trinity-knoda.spec b/redhat/applications/knoda/trinity-knoda.spec
deleted file mode 100644
index 9b4ef2c..0000000
--- a/redhat/applications/knoda/trinity-knoda.spec
+++ /dev/null
@@ -1,486 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-bakus/abakus-14.0.0.spec
-%if "%{?tde_prefix}" != "/usr"
-bakus/abakus-14.0.0.spec
-%define _variant .opt
-bakus/abakus-14.0.0.spec
-%endif
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-# TDE 3.5.13 specific building variables
-bakus/abakus-14.0.0.spec
-%define tde_bindir %{tde_prefix}/bin
-bakus/abakus-14.0.0.spec
-%define tde_datadir %{tde_prefix}/share
-bakus/abakus-14.0.0.spec
-%define tde_docdir %{tde_datadir}/doc
-bakus/abakus-14.0.0.spec
-%define tde_includedir %{tde_prefix}/include
-bakus/abakus-14.0.0.spec
-%define tde_libdir %{tde_prefix}/%{_lib}
-bakus/abakus-14.0.0.spec
-%define tde_mandir %{tde_datadir}/man
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-bakus/abakus-14.0.0.spec
-%define tde_tdedocdir %{tde_docdir}/tde
-bakus/abakus-14.0.0.spec
-%define tde_tdeincludedir %{tde_includedir}/tde
-bakus/abakus-14.0.0.spec
-%define tde_tdelibdir %{tde_libdir}/trinity
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%define _docdir %{tde_docdir}
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-Name:           trinity-knoda
-bakus/abakus-14.0.0.spec
-Version:        0.8.3
-bakus/abakus-14.0.0.spec
-Release:        1%{?dist}%{?_variant}
-bakus/abakus-14.0.0.spec
-Summary:        A database frontend for TDE.
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-Group:          Applications/Productivity
-bakus/abakus-14.0.0.spec
-License:        GPLv2+
-bakus/abakus-14.0.0.spec
-URL:            http://sourceforge.net/projects/knoda/
-bakus/abakus-14.0.0.spec
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-Source0:        http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.bz2
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-Patch1:			knoda-0.8.3-trinity.patch
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-BuildRequires:	desktop-file-utils
-bakus/abakus-14.0.0.spec
-BuildRequires:	trinity-tdelibs-devel
-bakus/abakus-14.0.0.spec
-BuildRequires:	hk_classes-devel
-bakus/abakus-14.0.0.spec
-Requires:		hk_classes
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%description
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%package devel
-bakus/abakus-14.0.0.spec
-Summary:  	Development files for %{name}
-bakus/abakus-14.0.0.spec
-Group: 		Development/Libraries
-bakus/abakus-14.0.0.spec
-Requires: 	%{name} = %{version}-%{release}
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%description devel
-bakus/abakus-14.0.0.spec
-%{summary}
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%if 0%{?suse_version}
-bakus/abakus-14.0.0.spec
-%debug_package
-bakus/abakus-14.0.0.spec
-%endif
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%prep
-bakus/abakus-14.0.0.spec
-%setup -q -n knoda-%{version}
-bakus/abakus-14.0.0.spec
-%patch1 -p1 -b .trinity
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-# Ugly hack to modify TQT include directory inside autoconf files.
-bakus/abakus-14.0.0.spec
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-bakus/abakus-14.0.0.spec
-%__sed -i admin/acinclude.m4.in \
-bakus/abakus-14.0.0.spec
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-bakus/abakus-14.0.0.spec
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-bakus/abakus-14.0.0.spec
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-bakus/abakus-14.0.0.spec
-%__make -f "admin/Makefile.common"
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%build
-bakus/abakus-14.0.0.spec
-unset QTDIR; . /etc/profile.d/qt3.sh
-bakus/abakus-14.0.0.spec
-export PATH="%{tde_bindir}:${PATH}"
-bakus/abakus-14.0.0.spec
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-export KDEDIR="%{tde_prefix}"
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%configure \
-bakus/abakus-14.0.0.spec
-	--prefix=%{tde_prefix} \
-bakus/abakus-14.0.0.spec
-	--exec-prefix=%{tde_prefix} \
-bakus/abakus-14.0.0.spec
-	--disable-dependency-tracking \
-bakus/abakus-14.0.0.spec
-	--disable-rpath \
-bakus/abakus-14.0.0.spec
-	--with-extra-includes=%{tde_includedir}/tqt \
-bakus/abakus-14.0.0.spec
-	--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
-bakus/abakus-14.0.0.spec
-	--bindir=%{tde_bindir} \
-bakus/abakus-14.0.0.spec
-	--libdir=%{tde_libdir} \
-bakus/abakus-14.0.0.spec
-	--datadir=%{tde_datadir} \
-bakus/abakus-14.0.0.spec
-	--includedir=%{tde_tdeincludedir} 
-bakus/abakus-14.0.0.spec
-  
-bakus/abakus-14.0.0.spec
-%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%install
-bakus/abakus-14.0.0.spec
-%__rm -rf $RPM_BUILD_ROOT
-bakus/abakus-14.0.0.spec
-%__make install DESTDIR=$RPM_BUILD_ROOT
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-# Useless files ..
-bakus/abakus-14.0.0.spec
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-bakus/abakus-14.0.0.spec
-%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%find_lang knoda
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%clean
-bakus/abakus-14.0.0.spec
-%__rm -rf $RPM_BUILD_ROOT
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%post
-bakus/abakus-14.0.0.spec
-for i in hicolor locolor ; do
-bakus/abakus-14.0.0.spec
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
-bakus/abakus-14.0.0.spec
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-bakus/abakus-14.0.0.spec
-done
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%postun
-bakus/abakus-14.0.0.spec
-for i in hicolor locolor ; do
-bakus/abakus-14.0.0.spec
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
-bakus/abakus-14.0.0.spec
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-bakus/abakus-14.0.0.spec
-done
-bakus/abakus-14.0.0.spec
-
-bakus/abakus-14.0.0.spec
-%files -f knoda.lang
-bakus/abakus-14.0.0.spec
-%defattr(-,root,root,-)
-bakus/abakus-14.0.0.spec
-%doc AUTHORS COPYING README ChangeLog
-bakus/abakus-14.0.0.spec
-%{tde_bindir}/knoda
-bakus/abakus-14.0.0.spec
-%{tde_bindir}/knoda-rt
-bakus/abakus-14.0.0.spec
-%{tde_libdir}/libhk_kdeclasses.la
-bakus/abakus-14.0.0.spec
 ** Diff limit reached (max: 250 lines) **