From 89bffdf4611085447a41efc0c2c8f49b46a3c942 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 10 Sep 2011 19:23:44 +0200 Subject: Slight updates on basic components --- redhat/kdebase/trinity-kdebase-3.5.13.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'redhat/kdebase') diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index e665696e7..c7e369e28 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,6 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif +%define release 0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -12,7 +13,7 @@ Name: trinity-kdebase Version: %{version} -Release: 0%{?dist}%{?_variant} +Release: %{?release}%{?dist}%{?_variant} License: GPL Vendor: Trinity Project Packager: Francois Andriot @@ -34,6 +35,7 @@ BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: cmake >= 2.8 BuildRequires: openssl-devel BuildRequires: avahi-devel avahi-qt3-devel BuildRequires: imake @@ -136,6 +138,9 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 +# Gets the cmake modules in current build directory +%__mkdir_p cmake/modules +%__cp -f %{_datadir}/cmake/*.* cmake/modules %build unset QTDIR || : ; . /etc/profile.d/qt.sh -- cgit v1.2.1 From fc93f1de72933ed84a90cebc3f2cc8863683b77c Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 11 Sep 2011 10:33:19 +0200 Subject: Some more cleanup to base components --- redhat/kdebase/trinity-kdebase-3.5.12.spec | 45 +++++++++++++++++++----------- redhat/kdebase/trinity-kdebase-3.5.13.spec | 32 ++++++++++++--------- 2 files changed, 48 insertions(+), 29 deletions(-) (limited to 'redhat/kdebase') diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index 8f2012085..79f260e10 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -1,21 +1,34 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%define release 6 + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt %define _docdir %{_prefix}/share/doc %endif +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_libdir %{_libdir}/kde3 + Name: trinity-kdebase -Version: 3.5.12 -Release: 9%{?dist}%{?_variant} +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} License: GPL -Vendor: Trinity Project -Packager: Thales Communications Summary: Trinity KDE Base Programs +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + Prefix: %{_prefix} -Source0: http://mirror3.tokra.lv/releases/3.5.12/kdebase-3.5.12.tar.gz +Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop @@ -159,7 +172,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -298,7 +311,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png %doc AUTHORS COPYING README -%{_docdir}/HTML/en/* +%{tde_docdir}/HTML/en/* %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde %{_bindir}/genkdmconf %{_bindir}/kaccess @@ -408,7 +421,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/servicetypes/* %{_datadir}/sounds/* %{_docdir}/kdm/README -%{_libdir}/kde3/* +%{tde_libdir}/* %{_libdir}/libkdeinit_*.* %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu %{_sysconfdir}/xdg/menus/kde-information.menu @@ -423,10 +436,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/config %endif # exclude pim-ioslaves files from main package -%exclude %{_libdir}/kde3/kio_ldap.* -%exclude %{_libdir}/kde3/kio_nntp.* -%exclude %{_libdir}/kde3/kio_pop3.* -%exclude %{_libdir}/kde3/kio_smtp.* +%exclude %{tde_libdir}/kio_ldap.* +%exclude %{tde_libdir}/kio_nntp.* +%exclude %{tde_libdir}/kio_pop3.* +%exclude %{tde_libdir}/kio_smtp.* %exclude %{_datadir}/services/ldap*.protocol %exclude %{_datadir}/services/nntp*.protocol %exclude %{_datadir}/services/pop3*.protocol @@ -440,10 +453,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files pim-ioslaves %defattr(-,root,root,-) -%{_libdir}/kde3/kio_ldap.* -%{_libdir}/kde3/kio_nntp.* -%{_libdir}/kde3/kio_pop3.* -%{_libdir}/kde3/kio_smtp.* +%{tde_libdir}/kio_ldap.* +%{tde_libdir}/kio_nntp.* +%{tde_libdir}/kio_pop3.* +%{tde_libdir}/kio_smtp.* %{_datadir}/services/ldap*.protocol %{_datadir}/services/nntp*.protocol %{_datadir}/services/pop3*.protocol diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index c7e369e28..c52d2f2b0 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -10,14 +10,21 @@ %define _docdir %{_prefix}/share/doc %endif +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_libdir %{_libdir}/trinity + Name: trinity-kdebase -Version: %{version} +Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL +Summary: Trinity KDE Base Programs + Vendor: Trinity Project Packager: Francois Andriot -Summary: Trinity KDE Base Programs +URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} @@ -35,7 +42,6 @@ BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel BuildRequires: qt3-devel >= 3.3.8d -BuildRequires: cmake >= 2.8 BuildRequires: openssl-devel BuildRequires: avahi-devel avahi-qt3-devel BuildRequires: imake @@ -283,7 +289,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png %doc AUTHORS COPYING README -%{_docdir}/kde/HTML/en/* +%{tde_docdir}/HTML/en/* %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde %{_bindir}/genkdmconf %{_bindir}/kaccess @@ -389,7 +395,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/sounds/* -%{_libdir}/trinity/* +%{tde_libdir}/* %{_libdir}/libkdeinit_*.* %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu %{_sysconfdir}/xdg/menus/kde-information.menu @@ -403,10 +409,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/config %endif # exclude pim-ioslaves files from main package -%exclude %{_libdir}/trinity/kio_ldap.* -%exclude %{_libdir}/trinity/kio_nntp.* -%exclude %{_libdir}/trinity/kio_pop3.* -%exclude %{_libdir}/trinity/kio_smtp.* +%exclude %{tde_libdir}/kio_ldap.* +%exclude %{tde_libdir}/kio_nntp.* +%exclude %{tde_libdir}/kio_pop3.* +%exclude %{tde_libdir}/kio_smtp.* %exclude %{_datadir}/services/ldap*.protocol %exclude %{_datadir}/services/nntp*.protocol %exclude %{_datadir}/services/pop3*.protocol @@ -423,10 +429,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files pim-ioslaves %defattr(-,root,root,-) -%{_libdir}/trinity/kio_ldap.* -%{_libdir}/trinity/kio_nntp.* -%{_libdir}/trinity/kio_pop3.* -%{_libdir}/trinity/kio_smtp.* +%{tde_libdir}/kio_ldap.* +%{tde_libdir}/kio_nntp.* +%{tde_libdir}/kio_pop3.* +%{tde_libdir}/kio_smtp.* %{_datadir}/services/ldap*.protocol %{_datadir}/services/nntp*.protocol %{_datadir}/services/pop3*.protocol -- cgit v1.2.1 From f6ce92a24ffe2ccb16db56a14655a01e0caf106a Mon Sep 17 00:00:00 2001 From: albator Date: Tue, 13 Sep 2011 19:34:56 +0200 Subject: Add kdeutils patches from Fedora8. Updated TDE 3.5.12 Spec file, confirmed working on RHEL6 and Fedora15. --- redhat/kdebase/trinity-kdebase-3.5.12.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'redhat/kdebase') diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index 79f260e10..9616f45d6 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 6 +%define release 10 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -21,6 +21,7 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: Trinity KDE Base Programs +Group: User Interface/Desktops Vendor: Trinity Project Packager: Francois Andriot @@ -477,6 +478,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libkdeinit_*.* %changelog +* Mon Sep 12 2011 Francois Andriot - 3.5.12-10 +- Add "Group" field + * Sun Sep 04 2011 Francois Andriot - 3.5.12-9 - Import to GIT -- cgit v1.2.1