| d3dc5fd3 | 2014-10-18 12:03:35 | François Andriot |
RPM Packaging: update R14 packages |
||
|
M redhat/Makefile.r14 M redhat/build/get_rpm_package_name.sh M redhat/extras/knoda/trinity-knoda.spec M redhat/tdebase/tdebase-14.0.0.spec |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 1c8c8d5..53ff582 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -26,7 +26,7 @@
libraries: libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras: icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
+extras: icons-nuvola kdevmon kdissert klamav knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
### Trinity Dependencies
@@ -672,6 +672,9 @@
trinity-filesystem:
$(call buildpkg,extras/trinity-filesystem)
+hk_classes:
+ $(call buildpkg,extras/hk_classes)
+
icons-nuvola:
$(call buildpkg,extras/icons-nuvola)
@@ -684,6 +687,9 @@
klamav:
$(call buildpkg,extras/klamav)
+knoda: hk_classes
+ $(call buildpkg,extras/knoda)
+
kompose:
$(call buildpkg,extras/kompose)
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 18255e1..a4d493d 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -17,7 +17,7 @@
# Some runtime packages are prefixed with 'trinity-', some are not.
case "${PKGNAME}" in
- "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|"avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"fileshareset") PREFIX="";;
+ "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|"avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"fileshareset"|"hk_classes") PREFIX="";;
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
"curl") PREFIX="trinity-lib";;
*) PREFIX="trinity-";;
diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec
index 9b4ef2c..8f643cd 100644
--- a/redhat/extras/knoda/trinity-knoda.spec
+++ b/redhat/extras/knoda/trinity-knoda.spec
@@ -1,486 +1,242 @@
# 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
+Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.gz
-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
+unset QTDIR QTINC QTLIB
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
+ --enable-rpath \
--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
+
+%__make %{?_smp_mflags} || %__make
-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
** Diff limit reached (max: 250 lines) **
|
||