Some more cleanup to base components

v3.5.13-sru
albator 13 years ago
parent 89bffdf461
commit fc93f1de72

@ -9,3 +9,5 @@ kdeutils
kdepim kdepim
kdesdk kdesdk
kdevelop kdevelop
kdemultimedia
kdeartwork

@ -18,7 +18,9 @@ Version: %{?version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: aRts (analog realtime synthesizer) - the KDE sound system Summary: aRts (analog realtime synthesizer) - the KDE sound system
Vendor: Trinity Project Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Source0: arts-%{version}.tar.gz Source0: arts-%{version}.tar.gz
@ -29,6 +31,7 @@ BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libtool-ltdl-devel BuildRequires: libtool-ltdl-devel
BuildRequires: gsl-devel
Requires: tqtinterface Requires: tqtinterface
Requires: audiofile Requires: audiofile
@ -65,7 +68,7 @@ Development files for %{name}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common %__make -f "admin/Makefile.common"
%build %build
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"

@ -18,7 +18,9 @@ Version: %{?version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: aRts (analog realtime synthesizer) - the KDE sound system Summary: aRts (analog realtime synthesizer) - the KDE sound system
Vendor: Trinity Project Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Source0: arts-%{version}.tar.gz Source0: arts-%{version}.tar.gz
@ -29,6 +31,7 @@ BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libtool-ltdl-devel BuildRequires: libtool-ltdl-devel
BuildRequires: gsl-devel
Requires: tqtinterface Requires: tqtinterface
Requires: audiofile Requires: audiofile
@ -69,6 +72,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
%__mkdir build %__mkdir build
cd build cd build
%cmake \ %cmake \
-DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
-DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
-DWITH_MAD=OFF \ -DWITH_MAD=OFF \
.. ..

@ -14,9 +14,9 @@
%define _includedir %{_prefix}/include/tqt %define _includedir %{_prefix}/include/tqt
# TDE 3.5.12 specific building variables # TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: qt3-devel >= 3.3.8b BuildRequires: qt3-devel >= 3.3.8b
Requires: qt3 >= 3.3.8b Requires: qt3 >= 3.3.8b
Name: tqtinterface Name: tqtinterface
@ -24,7 +24,9 @@ Version: %{version}
Release: %{release}%{?dist}%{?_variant} Release: %{release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity QT Interface Summary: Trinity QT Interface
Vendor: Trinity Project Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix} Prefix: %{_prefix}
@ -51,7 +53,7 @@ Development files for %{name}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common %__make -f "admin/Makefile.common"
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh

@ -17,9 +17,9 @@
%define _includedir %{_prefix}/include/tqt %define _includedir %{_prefix}/include/tqt
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: qt3-devel >= 3.3.8d BuildRequires: qt3-devel >= 3.3.8d
Requires: qt3 >= 3.3.8d Requires: qt3 >= 3.3.8d
Name: tqtinterface Name: tqtinterface
@ -27,7 +27,9 @@ Version: %{version}
Release: %{release}%{?dist}%{?_variant} Release: %{release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity QT Interface Summary: Trinity QT Interface
Vendor: Trinity Project Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix} Prefix: %{_prefix}

@ -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 TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_prefix}/share/doc %define _docdir %{_prefix}/share/doc
%endif %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 Name: trinity-kdebase
Version: 3.5.12 Version: %{?version}
Release: 9%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Vendor: Trinity Project
Packager: Thales Communications
Summary: Trinity KDE Base Programs Summary: Trinity KDE Base Programs
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix} 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 # Wrapper script to prevent Plasma launch at Trinity Startup
Source1: plasma-desktop 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/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common %__make -f "admin/Makefile.common"
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh 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 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
%doc AUTHORS COPYING README %doc AUTHORS COPYING README
%{_docdir}/HTML/en/* %{tde_docdir}/HTML/en/*
%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
%{_bindir}/genkdmconf %{_bindir}/genkdmconf
%{_bindir}/kaccess %{_bindir}/kaccess
@ -408,7 +421,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/servicetypes/* %{_datadir}/servicetypes/*
%{_datadir}/sounds/* %{_datadir}/sounds/*
%{_docdir}/kdm/README %{_docdir}/kdm/README
%{_libdir}/kde3/* %{tde_libdir}/*
%{_libdir}/libkdeinit_*.* %{_libdir}/libkdeinit_*.*
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
%{_sysconfdir}/xdg/menus/kde-information.menu %{_sysconfdir}/xdg/menus/kde-information.menu
@ -423,10 +436,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/config %exclude %{_datadir}/config
%endif %endif
# exclude pim-ioslaves files from main package # exclude pim-ioslaves files from main package
%exclude %{_libdir}/kde3/kio_ldap.* %exclude %{tde_libdir}/kio_ldap.*
%exclude %{_libdir}/kde3/kio_nntp.* %exclude %{tde_libdir}/kio_nntp.*
%exclude %{_libdir}/kde3/kio_pop3.* %exclude %{tde_libdir}/kio_pop3.*
%exclude %{_libdir}/kde3/kio_smtp.* %exclude %{tde_libdir}/kio_smtp.*
%exclude %{_datadir}/services/ldap*.protocol %exclude %{_datadir}/services/ldap*.protocol
%exclude %{_datadir}/services/nntp*.protocol %exclude %{_datadir}/services/nntp*.protocol
%exclude %{_datadir}/services/pop3*.protocol %exclude %{_datadir}/services/pop3*.protocol
@ -440,10 +453,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files pim-ioslaves %files pim-ioslaves
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/kde3/kio_ldap.* %{tde_libdir}/kio_ldap.*
%{_libdir}/kde3/kio_nntp.* %{tde_libdir}/kio_nntp.*
%{_libdir}/kde3/kio_pop3.* %{tde_libdir}/kio_pop3.*
%{_libdir}/kde3/kio_smtp.* %{tde_libdir}/kio_smtp.*
%{_datadir}/services/ldap*.protocol %{_datadir}/services/ldap*.protocol
%{_datadir}/services/nntp*.protocol %{_datadir}/services/nntp*.protocol
%{_datadir}/services/pop3*.protocol %{_datadir}/services/pop3*.protocol

@ -10,14 +10,21 @@
%define _docdir %{_prefix}/share/doc %define _docdir %{_prefix}/share/doc
%endif %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 Name: trinity-kdebase
Version: %{version} Version: %{?version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity KDE Base Programs
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Summary: Trinity KDE Base Programs URL: http://www.trinitydesktop.org/
Prefix: %{_prefix} Prefix: %{_prefix}
@ -35,7 +42,6 @@ BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: qt3-devel >= 3.3.8d BuildRequires: qt3-devel >= 3.3.8d
BuildRequires: cmake >= 2.8
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: avahi-devel avahi-qt3-devel BuildRequires: avahi-devel avahi-qt3-devel
BuildRequires: imake BuildRequires: imake
@ -283,7 +289,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
%doc AUTHORS COPYING README %doc AUTHORS COPYING README
%{_docdir}/kde/HTML/en/* %{tde_docdir}/HTML/en/*
%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
%{_bindir}/genkdmconf %{_bindir}/genkdmconf
%{_bindir}/kaccess %{_bindir}/kaccess
@ -389,7 +395,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/services/* %{_datadir}/services/*
%{_datadir}/servicetypes/* %{_datadir}/servicetypes/*
%{_datadir}/sounds/* %{_datadir}/sounds/*
%{_libdir}/trinity/* %{tde_libdir}/*
%{_libdir}/libkdeinit_*.* %{_libdir}/libkdeinit_*.*
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
%{_sysconfdir}/xdg/menus/kde-information.menu %{_sysconfdir}/xdg/menus/kde-information.menu
@ -403,10 +409,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/config %exclude %{_datadir}/config
%endif %endif
# exclude pim-ioslaves files from main package # exclude pim-ioslaves files from main package
%exclude %{_libdir}/trinity/kio_ldap.* %exclude %{tde_libdir}/kio_ldap.*
%exclude %{_libdir}/trinity/kio_nntp.* %exclude %{tde_libdir}/kio_nntp.*
%exclude %{_libdir}/trinity/kio_pop3.* %exclude %{tde_libdir}/kio_pop3.*
%exclude %{_libdir}/trinity/kio_smtp.* %exclude %{tde_libdir}/kio_smtp.*
%exclude %{_datadir}/services/ldap*.protocol %exclude %{_datadir}/services/ldap*.protocol
%exclude %{_datadir}/services/nntp*.protocol %exclude %{_datadir}/services/nntp*.protocol
%exclude %{_datadir}/services/pop3*.protocol %exclude %{_datadir}/services/pop3*.protocol
@ -423,10 +429,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files pim-ioslaves %files pim-ioslaves
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/trinity/kio_ldap.* %{tde_libdir}/kio_ldap.*
%{_libdir}/trinity/kio_nntp.* %{tde_libdir}/kio_nntp.*
%{_libdir}/trinity/kio_pop3.* %{tde_libdir}/kio_pop3.*
%{_libdir}/trinity/kio_smtp.* %{tde_libdir}/kio_smtp.*
%{_datadir}/services/ldap*.protocol %{_datadir}/services/ldap*.protocol
%{_datadir}/services/nntp*.protocol %{_datadir}/services/nntp*.protocol
%{_datadir}/services/pop3*.protocol %{_datadir}/services/pop3*.protocol

@ -22,10 +22,11 @@ Version: %{?version}
Release: %{?release}%{?dist}%{_variant} Release: %{?release}%{?dist}%{_variant}
License: GPLv2 License: GPLv2
URL: http://developer.kde.org/language-bindings/ Group: User Interface/Desktops
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Group: User Interface/Desktops URL: http://developer.kde.org/language-bindings/
Source0: kdebindings-%{version}.tar.gz Source0: kdebindings-%{version}.tar.gz

@ -22,10 +22,11 @@ Version: %{?version}
Release: %{?release}%{?dist}%{_variant} Release: %{?release}%{?dist}%{_variant}
License: GPLv2 License: GPLv2
URL: http://developer.kde.org/language-bindings/ Group: User Interface/Desktops
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Group: User Interface/Desktops URL: http://developer.kde.org/language-bindings/
Source0: kdebindings-%{version}.tar.gz Source0: kdebindings-%{version}.tar.gz

@ -10,7 +10,7 @@
%define _docdir %{_prefix}/share/doc %define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific variables # TDE 3.5.12 specific variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir} %define tde_docdir %{_docdir}
%define tde_libdir %{_libdir}/kde3 %define tde_libdir %{_libdir}/kde3
@ -20,9 +20,11 @@ Name: trinity-kdelibs
Version: %{version} Version: %{version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity KDE Libraries
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Summary: Trinity KDE Libraries URL: http://www.trinitydesktop.org/
Source0: kdelibs-%{version}.tar.gz Source0: kdelibs-%{version}.tar.gz
Prefix: %{_prefix} Prefix: %{_prefix}
@ -73,7 +75,7 @@ format for easy browsing
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common %__make -f "admin/Makefile.common"
%build %build
@ -81,6 +83,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
export LD_LIBRARY_PATH="%{_libdir}" export LD_LIBRARY_PATH="%{_libdir}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%configure \ %configure \
--disable-rpath \ --disable-rpath \
--enable-new-ldflags \ --enable-new-ldflags \
@ -113,13 +116,6 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%__mkdir_p %{?buildroot} %__mkdir_p %{?buildroot}
%make_install %make_install
%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%if "%{?_prefix}" != "/usr"
%{_libdir}
%endif
%{tde_libdir}
EOF
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
@ -193,7 +189,7 @@ EOF
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_libdir}/libkdeinit_*.so %{_libdir}/libkdeinit_*.so
%{_libdir}/lib*.la %{_libdir}/lib*.la
%{_libdir}/kde3/ %{tde_libdir}/
%{_datadir}/applications/kde/*.desktop %{_datadir}/applications/kde/*.desktop
%{_datadir}/autostart/kab2kabc.desktop %{_datadir}/autostart/kab2kabc.desktop
%{_datadir}/applnk/kio_iso.desktop %{_datadir}/applnk/kio_iso.desktop
@ -207,7 +203,7 @@ EOF
%{_datadir}/services/* %{_datadir}/services/*
%{_datadir}/servicetypes/* %{_datadir}/servicetypes/*
%{_datadir}/icons/crystalsvg/ %{_datadir}/icons/crystalsvg/
%{_docdir}/HTML/en/kspell %{tde_docdir}/HTML/en/kspell
# remove conflicts with kdelibs-4 # remove conflicts with kdelibs-4
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%{_bindir}/checkXML %{_bindir}/checkXML
@ -216,7 +212,7 @@ EOF
%{_bindir}/preparetips %{_bindir}/preparetips
%{_datadir}/icons/hicolor/index.theme %{_datadir}/icons/hicolor/index.theme
%{_datadir}/locale/all_languages %{_datadir}/locale/all_languages
%{_docdir}/HTML/en/common/* %{tde_docdir}/HTML/en/common/*
%else %else
%exclude %{_bindir}/checkXML %exclude %{_bindir}/checkXML
%exclude %{_bindir}/ksvgtopng %exclude %{_bindir}/ksvgtopng
@ -229,9 +225,8 @@ EOF
%exclude %{_datadir}/config/ui/ui_standards.rc %exclude %{_datadir}/config/ui/ui_standards.rc
%exclude %{_datadir}/icons/hicolor/index.theme %exclude %{_datadir}/icons/hicolor/index.theme
%exclude %{_datadir}/locale/all_languages %exclude %{_datadir}/locale/all_languages
%exclude %{_docdir}/HTML/en/common/* %exclude %{tde_docdir}/HTML/en/common/*
%endif %endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf
# Provided by 'redhat-menus' package # Provided by 'redhat-menus' package
%exclude %{_sysconfdir}/xdg/menus/applications.menu %exclude %{_sysconfdir}/xdg/menus/applications.menu
@ -250,7 +245,7 @@ EOF
%files apidocs %files apidocs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/ %{_docdir}/%{name}-%{version}/
%{_docdir}/HTML/en/kdelibs* %{tde_docdir}/HTML/en/kdelibs*
%changelog %changelog

@ -20,9 +20,11 @@ Name: trinity-kdelibs
Version: %{version} Version: %{version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity KDE Libraries
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Summary: Trinity KDE Libraries URL: http://www.trinitydesktop.org/
Source0: kdelibs-%{version}.tar.gz Source0: kdelibs-%{version}.tar.gz
Prefix: %{_prefix} Prefix: %{_prefix}
@ -190,7 +192,7 @@ EOF
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_libdir}/libkdeinit_*.so %{_libdir}/libkdeinit_*.so
%{_libdir}/lib*.la %{_libdir}/lib*.la
%{_libdir}/trinity/ %{tde_libdir}/
%{_datadir}/applications/kde/*.desktop %{_datadir}/applications/kde/*.desktop
%{_datadir}/autostart/kab2kabc.desktop %{_datadir}/autostart/kab2kabc.desktop
%{_datadir}/applnk/kio_iso.desktop %{_datadir}/applnk/kio_iso.desktop
@ -204,7 +206,7 @@ EOF
%{_datadir}/services/* %{_datadir}/services/*
%{_datadir}/servicetypes/* %{_datadir}/servicetypes/*
%{_datadir}/icons/crystalsvg/ %{_datadir}/icons/crystalsvg/
%{_docdir}/kde/HTML/en/kspell %{tde_docdir}/HTML/en/kspell
# remove conflicts with kdelibs-4 # remove conflicts with kdelibs-4
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%{_bindir}/checkXML %{_bindir}/checkXML
@ -213,7 +215,7 @@ EOF
%{_bindir}/preparetips %{_bindir}/preparetips
%{_datadir}/icons/hicolor/index.theme %{_datadir}/icons/hicolor/index.theme
%{_datadir}/locale/all_languages %{_datadir}/locale/all_languages
%{_docdir}/kde/HTML/en/common/* %{tde_docdir}/HTML/en/common/*
%else %else
%exclude %{_bindir}/checkXML %exclude %{_bindir}/checkXML
%exclude %{_bindir}/ksvgtopng %exclude %{_bindir}/ksvgtopng
@ -226,7 +228,7 @@ EOF
%exclude %{_datadir}/config/ui/ui_standards.rc %exclude %{_datadir}/config/ui/ui_standards.rc
%exclude %{_datadir}/icons/hicolor/index.theme %exclude %{_datadir}/icons/hicolor/index.theme
%exclude %{_datadir}/locale/all_languages %exclude %{_datadir}/locale/all_languages
%exclude %{_docdir}/kde/HTML/en/common/* %exclude %{tde_docdir}/HTML/en/common/*
%endif %endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf %{_sysconfdir}/ld.so.conf.d/trinity.conf
@ -253,7 +255,7 @@ EOF
%files apidocs %files apidocs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/ %{_docdir}/%{name}-%{version}/
#%{_docdir}/kde/HTML/en/kdelibs* #%{tde_docdir}/HTML/en/kdelibs*
%changelog %changelog

@ -20,10 +20,12 @@ Name: trinity-kdepim
Version: %{?version} Version: %{?version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Group: Applications/Productivity
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Summary: PIM (Personal Information Manager) applications Summary: PIM (Personal Information Manager) applications
Group: Applications/Productivity
Prefix: %{_prefix} Prefix: %{_prefix}
Source0: kdepim-%{version}.tar.gz Source0: kdepim-%{version}.tar.gz
@ -64,7 +66,7 @@ Development files for %{name}.
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common %__make -f "admin/Makefile.common"
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh

@ -20,10 +20,12 @@ Name: trinity-kdepim
Version: %{?version} Version: %{?version}
Release: %{?release}%{?dist}%{?_variant} Release: %{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Group: Applications/Productivity
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Summary: PIM (Personal Information Manager) applications Summary: PIM (Personal Information Manager) applications
Group: Applications/Productivity
Prefix: %{_prefix} Prefix: %{_prefix}
Source0: kdepim-%{version}.tar.gz Source0: kdepim-%{version}.tar.gz

Loading…
Cancel
Save