diff options
23 files changed, 582 insertions, 145 deletions
diff --git a/redhat/components.txt b/redhat/components.txt index 2dd00f99f..19164cd87 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -1,3 +1,5 @@ +dependencies/libcaldav +dependencies/libcarddav dependencies/qt3 dependencies/tqtinterface dependencies/dbus-tqt diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 76df15c1c..a8e9f40c9 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -18,13 +18,16 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the KDE sound system +Group: System Environment/Daemons Vendor: Trinity Project URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> -Source0: arts-%{version}.tar.gz Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: arts-%{version}.tar.gz BuildRequires: tqtinterface-devel BuildRequires: audiofile-devel @@ -54,8 +57,9 @@ playing a wave file with some effects. %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %if "%{?_prefix}" == "/usr" Obsoletes: arts-devel %endif @@ -80,6 +84,7 @@ cd build %__make %{?_smp_mflags} %install +%__rm -rf %{?buildroot} %__make install -C build DESTDIR=%{?buildroot} %clean diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index f1762a9d7..8e06021d6 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -20,10 +20,14 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: Dbus TQT Interface +Group: System Environment/Libraries + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ @@ -37,6 +41,7 @@ Dbus TQT Interface %package devel Requires: %{name} Summary: %{name} - Development files +Group: Development/Libraries %description devel Development files for %{name} @@ -58,7 +63,7 @@ cd build %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot}%{_includedir} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build %clean %__rm -rf %{?buildroot} diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 220913b3b..86b0f4c8b 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -10,8 +10,16 @@ License: GPL Group: System Environment/Libraries Summary: A client library that adds support for the CalDAV protocol (rfc4791). +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: libcaldav_0.6.5-2debian2.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildRequires: libcurl-devel +%else +BuildRequires: trinity-libcurl-devel +%endif + %description libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). The object is to have a library which fully implements the protocol so that it is @@ -38,6 +46,10 @@ autoreconf --force --install --symlink %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# The include files do not go in the correct directory +%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.2/*.h %{buildroot}%{_includedir} +%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2 + %clean %__rm -rf %{buildroot} @@ -47,7 +59,7 @@ autoreconf --force --install --symlink %{_datadir}/doc/%{name} %files devel -%{_includedir}/%{name}-0.6.2 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index cc01ccc69..ed1ce2a70 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -8,10 +8,18 @@ Packager: Francois Andriot <francois.andriot@free.fr> License: GPL Group: System Environment/Libraries -Summary: Libcarddav is a portable CardDAV client implementation. +Summary: A portable CardDAV client implementation originally developed for the Trinity PIM suite. + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: libcarddav_0.6.2-2debian2.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildRequires: libcurl-devel +%else +BuildRequires: trinity-libcurl-devel +%endif + %description Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. @@ -38,6 +46,10 @@ autoreconf --force --install --symlink %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# The include files do not go in the correct directory +%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir} +%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1 + %clean %__rm -rf %{buildroot} @@ -46,7 +58,7 @@ autoreconf --force --install --symlink %{_libdir}/*.so.* %files devel -%{_includedir}/%{name}-0.6.1 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index 859afa0bd..d1a56fa18 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -27,12 +27,14 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface +Group: System Environment/Libraries Vendor: Trinity Project URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz @@ -45,8 +47,9 @@ BuildRequires: pth-devel Trinity QT Interface %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %description devel Development files for %{name} @@ -75,11 +78,18 @@ cd build %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot}%{_includedir} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build + +# RHEL 5: add newline at end of include files +%if 0%{?rhel} && 0%{?rhel} <= 5 +for i in %{?buildroot}%{_includedir}/*.h; do + echo "" >>${i} +done +%endif # Fix 'tqt.pc': UIC executable is not correct -sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ - -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' +#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ +# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' # Install 'cmake' modules for a specific package (for later use) %__mkdir_p %{?buildroot}%{cmake_modules_dir} diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh index ab337ac6a..9715cffd0 100755 --- a/redhat/gentarball.sh +++ b/redhat/gentarball.sh @@ -27,33 +27,62 @@ select COMP in $( cut -f1 components.txt ) ; do echo echo "You currently have the following tarball(s): " for i in ${ARCHIVEDIR}/${COMP##*/}*.tar.gz; do echo " ${i##*/}"; done + echo fi # Checks latest SVN revision - SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" ) - ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz + unset ARCHIVENAME + case "${COMP##*/}" in + "libcaldav"|"libcarddav"|"qt3") ;; + *) + SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" ) + ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz - if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then - echo "You already have the latest revision (${SVNREV})"; - fi + if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then + echo "You already have the latest revision (${SVNREV})"; + else + echo "A new revision is available: ${SVNREV}" + fi + ;; + esac echo - echo "Press ENTER to download a new version, or CTRL+C to abort." + echo "Press ENTER to download the new tarball, or CTRL+C to abort." read rep TMPDIRTDE=$(mktemp -d) pushd "${TMPDIRTDE}" >/dev/null mkdir -p "${TMPDIRTDE}/${COMP}" pushd "${COMP}/.." >/dev/null - echo "Extracting '${COMP}' from SVN ..." case "${COMP##*/}" in - "qt3") git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . ;; - *) svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP} ;; + "libcaldav") + echo "Downloading '${COMP}' ..." + ARCHIVENAME="libcaldav_0.6.5-2debian2.tar.gz" + wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcaldav_0.6.5-2debian2.tar.gz" + ;; + "libcarddav") + echo "Downloading '${COMP}' ..." + ARCHIVENAME="libcarddav_0.6.2-2debian2.tar.gz" + wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcarddav_0.6.2-2debian2.tar.gz" + ;; + "qt3") + echo "Extracting '${COMP}' from GIT ..." + git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . + ;; + *) + echo "Extracting '${COMP}' from SVN ..." + svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP} + ;; esac - popd >/dev/null - echo "Creating archive '${ARCHIVENAME}' ..." - tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP} + if [ ! -r "${ARCHIVENAME}" ]; then + popd >/dev/null + echo "Creating archive '${ARCHIVENAME}' ..." + tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP} + else + mv *.tar.gz ${ARCHIVEDIR}/ + popd >/dev/null + fi popd >/dev/null echo "Cleaning temporary directory ..." rm -rf "${TMPDIRTDE}" diff --git a/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch b/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch new file mode 100644 index 000000000..70e72dc96 --- /dev/null +++ b/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch @@ -0,0 +1,64 @@ +--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than 2006-06-07 18:52:09.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp 2006-06-07 18:54:06.000000000 +0200 +@@ -183,6 +183,7 @@ + SDL_UpdateRect(surface, 0, 0, 0, 0); + } + ++#if 0 + int SdlScreen::winID(void) + { + SDL_SysWMinfo info; +@@ -195,3 +196,4 @@ + SDL_GetWMInfo(&info); + return info.info.x11.wmwindow; + } ++#endif +--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than 2006-06-07 18:54:19.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp 2006-06-07 18:54:27.000000000 +0200 +@@ -112,7 +112,7 @@ + { + time_t timer = time(NULL); + +- printf("%u\n", static_cast<SdlScreen *>(screen)->winID()); ++ //printf("%u\n", static_cast<SdlScreen *>(screen)->winID()); + fflush(stdout); + + int frames = 0; +--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than 2006-06-07 18:51:25.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h 2006-06-07 18:51:56.000000000 +0200 +@@ -108,7 +108,7 @@ + int sizeUpdate(); + bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit); + void show(); +- int winID(); ++ //int winID(); + }; + + // core +--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than 2006-06-07 18:54:38.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp 2006-06-07 18:55:00.000000000 +0200 +@@ -52,6 +52,7 @@ + SDL_Surface *screen; + } + ++#if 0 + int winID(void) + { + SDL_SysWMinfo info; +@@ -61,6 +62,7 @@ + SDL_GetWMInfo(&info); + return info.info.x11.wmwindow; + } ++#endif + + int main(int, char **) + { +@@ -74,7 +76,7 @@ + access_mutex = SDL_CreateMutex(); + + init_renderer1(); +- printf("%u\n", winID()); ++ //printf("%u\n", winID()); + fflush(stdout); + init_renderer2(); + thread = SDL_CreateThread((int (*)(void *))renderer, NULL); diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index f060b3c44..3229fe15d 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -152,7 +152,7 @@ Requires: %{name} = %{version}-%{release} %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs %if "%{?_prefix}" == "/usr" Obsoletes: kdebase%{?_qt_suffix}-libs %endif diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index a35207c56..70285a44c 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -15,24 +15,34 @@ BuildRequires: cmake >= 2.8 %define tde_docdir %{_docdir}/kde %define tde_libdir %{_libdir}/trinity +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + Name: trinity-kdebase Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: Trinity KDE Base Programs +Group: User Interface/Desktops 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: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop +Patch100: svn.patch + # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -44,7 +54,7 @@ Patch6: kdebase-3.5.12-halmountoptions.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel -BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: qt%{?_qt_suffix}-devel BuildRequires: openssl-devel BuildRequires: avahi-devel avahi-qt3-devel BuildRequires: imake @@ -55,7 +65,7 @@ BuildRequires: dbus-devel dbus-qt-devel BuildRequires: lm_sensors-devel BuildRequires: libfontenc-devel BuildRequires: hal-devel -BuildRequires: audiofile-devel +BuildRequires: audiofile-devel alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libraw1394-devel BuildRequires: openldap-devel @@ -63,13 +73,17 @@ BuildRequires: libvorbis-devel BuildRequires: pam-devel BuildRequires: libXdmcp-devel BuildRequires: libxkbfile-devel +BuildRequires: libusb-devel +BuildRequires: esound-devel glib2-devel nas-devel +BuildRequires: libXcomposite-devel BuildRequires: dbus-tqt-devel BuildRequires: libXtst-devel +BuildRequires: libXdamage-devel Requires: tqtinterface Requires: trinity-arts Requires: trinity-kdelibs -Requires: qt3 >= 3.3.8d +Requires: qt%{?_qt_suffix} Requires: openssl Requires: avahi avahi-qt3 Requires: dbus-tqt @@ -98,7 +112,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: trinity-kdelibs-devel Summary: %{summary} - Development files %if "%{?_prefix}" == "/usr" -Obsoletes: kdebase3-devel +Obsoletes: kdebase%{?_qt_suffix}-devel %endif Group: Development/Libraries %description devel @@ -124,7 +138,7 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries Requires: trinity-kdelibs %if "%{?_prefix}" == "/usr" -Obsoletes: kdebase3-libs +Obsoletes: kdebase%{?_qt_suffix}-libs %endif Requires: %{name} = %{version}-%{release} %description libs @@ -148,6 +162,8 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 +%patch100 -p1 + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -166,7 +182,11 @@ cd build -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ +%if 0%{?fedora} || 0%{?rhel} > 5 -DWITH_XRANDR=ON \ +%else + -DWITH_XRANDR=OFF \ +%endif -DWITH_XRENDER=ON \ -DWITH_XDAMAGE=ON \ -DWITH_XEXT=ON \ @@ -186,8 +206,7 @@ cd build %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build # Adds a GDM/KDM/XDM session called 'TDE' %if "%{?_prefix}" != "/usr" @@ -327,7 +346,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/konqueror %{_bindir}/konsole %{_bindir}/krandom.kss -%{_bindir}/krandrtray %{_bindir}/krdb %{_bindir}/kreadconfig %{_bindir}/ksmserver @@ -375,6 +393,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/khc_mansearch.pl %{_bindir}/kicker %{_bindir}/knetattach +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%{_bindir}/krandrtray +%endif %{_bindir}/kompmgr %{_bindir}/kpm %{_bindir}/ksplash @@ -404,12 +425,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{tde_libdir}/* %{_libdir}/libkdeinit_*.* %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu +%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr" +%exclude %{_sysconfdir}/xdg/menus/kde-information.menu +%else %{_sysconfdir}/xdg/menus/kde-information.menu +%endif %{_sysconfdir}/xdg/menus/kde-screensavers.menu %{_sysconfdir}/xdg/menus/kde-settings.menu /usr/share/xsessions/*.desktop # Remove conflicts with redhat-menus %if "%{?_prefix}" != "/usr" +%{_bindir}/plasma-desktop %config(noreplace) %{_datadir}/config/* %else %exclude %{_datadir}/config @@ -424,9 +450,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/pop3*.protocol %exclude %{_datadir}/services/smtp*.protocol -# New in TDE 3.5.12 -%{_bindir}/plasma-desktop - # New in TDE 3.5.13 %{_bindir}/krootbacking %{_bindir}/tsak diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec index 3e654a49f..2c4af58b7 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec @@ -27,7 +27,7 @@ Group: User Interface/Desktops Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://developer.kde.org/language-bindings/ +URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz @@ -211,6 +211,7 @@ done %clean %__rm -rf $RPM_BUILD_ROOT + %post /sbin/ldconfig ||: touch --no-create %{_datadir}/icons/hicolor ||: @@ -265,7 +266,7 @@ update-desktop-database >& /dev/null ||: %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%{tde_includedir}/* %{_libdir}/lib*.so %if "%{?_with_java:1}" == "1" %{_libdir}/jni/*.so diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index f0b76045b..d395d44fb 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -13,8 +13,8 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +%define tde_includedir %{_includedir}/kde Name: trinity-kdebindings @@ -31,6 +31,10 @@ URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + # RedHat Legacy patches (from Fedora) Patch1: kdebindings-3.5.6-libgcj.patch @@ -40,6 +44,8 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: zlib-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: trinity-arts-devel +BuildRequires: glib-devel gtk+-devel +BuildRequires: gtk2-devel %define perl_ver %{expand:%%(eval `perl -V:version`; echo $version)} %define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)} %define perl_vendorlib %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)} @@ -60,12 +66,16 @@ Provides: %{name}-dcoppython = %{version}-%{release} ## ruby BuildRequires: ruby-devel >= 1.8, ruby Provides: %{name}-ruby = %{version}-%{release} +%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} ## java -#BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java +%if 0%{?rhel} && 0%{?rhel} < 6 +BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java +%else BuildRequires: java-devel >= 1.4.2 +%endif %define java_home %{_usr}/lib/jvm/java %define _with_java --with-java=%{java_home} Provides: %{name}-java = %{version}-%{release} @@ -122,6 +132,7 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python" --disable-dependency-tracking \ --with-extra-libs=%{_libdir} \ --with-pythondir=%{_usr} \ + --enable-closure \ --disable-final \ %{?_with_java} %{!?_with_java:--without-java} \ %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \ @@ -149,7 +160,7 @@ popd export PATH="%{_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT -%make_install \ +%__make install DESTDIR=%{?buildroot} \ PYTHON=%{__python} desktop-file-install \ @@ -176,14 +187,6 @@ fi # locale's %find_lang %{name} || touch %{name}.lang HTML_DIR=$(kde-config --expandvars --install html) - -# Fix HTML doc location in TDE 3.5.13 -# (from 'share/doc/HTML' to 'share/doc/kde/HTML') -if [ ! -d $RPM_BUILD_ROOT$HTML_DIR ] && [ -d $RPM_BUILD_ROOT%{_docdir}/HTML ]; then - mkdir -p $RPM_BUILD_ROOT${HTML_DIR%/*} - mv -f $RPM_BUILD_ROOT%{_docdir}/HTML $RPM_BUILD_ROOT${HTML_DIR%/*} -fi - if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do if [ -d $lang_dir ]; then @@ -248,17 +251,14 @@ update-desktop-database >& /dev/null ||: #%{ruby_sitelib}/K* #%{ruby_sitelib}/Qt* %{_usr}/lib/ruby/*/* -%if 0%{?fedora} >= 15 -%{_usr}/lib64/ruby/*/*/*.so.* -%else -%{_usr}/lib64/ruby/*/*.so.* -%endif +%{ruby_arch}/*.so.* +%doc %lang(en) %{_docdir}/HTML/en/javalib/* # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%endif %exclude %{_mandir}/man1/kjscmd* +%endif %files dcopperl -f %{name}-dcopperl.list @@ -274,13 +274,8 @@ update-desktop-database >& /dev/null ||: %{_libdir}/jni/*.so %{_libdir}/jni/*.la %endif -%if 0%{?fedora} >= 15 -%{_usr}/lib64/ruby/*/*/*.so -%{_usr}/lib64/ruby/*/*/*.la -%else -%{_usr}/lib64/ruby/*/*.so -%{_usr}/lib64/ruby/*/*.la -%endif +%{ruby_arch}/*.so +%{ruby_arch}/*.la %changelog * Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.12.99.20110903-0 diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 682142a65..056229f1c 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -15,71 +15,91 @@ BuildRequires: cmake >= 2.8 %define tde_docdir %{_docdir}/kde %define tde_libdir %{_libdir}/trinity +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + Name: trinity-kdelibs Version: %{version} Release: %{?release}%{?dist}%{?_variant} License: GPL -Summary: Trinity KDE Libraries +Summary: TDE Libraries +Group: System Environment/Libraries Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Source0: kdelibs-%{version}.tar.gz Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdelibs-%{version}.tar.gz BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: qt3-devel -BuildRequires: avahi-devel avahi-qt3-devel -#BuildRequires: lua-devel +BuildRequires: avahi-devel +BuildRequires: lua-devel BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: libutempter-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel -BuildRequires: libtiff-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: qt%{?_qt_suffix}-devel +BuildRequires: avahi-qt3-devel BuildRequires: jasper-devel -Requires: tqtinterface -Requires: trinity-arts -Requires: qt3 -Requires: avahi avahi-qt3 +Requires: tqtinterface +Requires: trinity-arts +Requires: avahi +Requires: qt%{?_qt_suffix} +Requires: avahi-qt3 %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3 +Obsoletes: kdelibs%{?_qt_suffix} %endif %description -Libraries for the Trinity K Desktop Environment +Libraries for the Trinity Desktop Environment: +KDE Libraries included: kdecore (KDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + %package devel -Requires: %{name} Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3-devel +Obsoletes: kdelibs%{?_qt_suffix}-devel %endif %description devel -Development files for %{name} +This package includes the header files you will need to compile +applications for TDE. %package apidocs -Requires: %{name} +Group: Development/Libraries Summary: %{name} - API documentation +Requires: %{name} = %{version}-%{release} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs%{?_qt_suffix}-apidocs-devel +%endif %description apidocs -This package includes the KDE 3 API documentation in HTML +This package includes the TDE API documentation in HTML format for easy browsing + %prep %setup -q -n kdelibs -# 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 export PATH="%{_bindir}:${PATH}" @@ -111,17 +131,17 @@ cd build %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build %__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf %if "%{?_prefix}" != "/usr" %{_libdir} %endif -%{_libdir}/trinity +%{tde_libdir} EOF + %clean %__rm -rf %{?buildroot} diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec index e4f1f310c..82e4df87f 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec @@ -43,6 +43,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdemultimedia-%{version}.tar.gz +Provides: kdemultimedia3 = %{version}-%{release} + # RedHat Legacy patches (from Fedora 8) Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch @@ -159,7 +161,8 @@ export CXXFLAGS="${CXXFLAGS} -lDCOP" %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} \ - --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt + --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} @@ -172,7 +175,7 @@ export PATH="%{_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C kaudiocreator ## Remove/uninstall (conflicting) bits we don't want -rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass +%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass # only show in KDE, really? -- Rex (FIXME) for f in %{buildroot}%{appdir}/*.desktop ; do @@ -217,6 +220,7 @@ done %post +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -224,6 +228,7 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 868754041..0eda9a831 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -38,8 +38,10 @@ 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: kdemultimedia-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: kdemultimedia3 = %{version}-%{release} @@ -47,8 +49,8 @@ Provides: kdemultimedia3 = %{version}-%{release} Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch -Patch100: svn.patch +Provides: kdemultimedia3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} @@ -67,6 +69,8 @@ BuildRequires: automake libtool %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_xine:BuildRequires: xine-lib-devel} +BuildRequires: libXxf86dga-devel +BuildRequires: libXxf86vm-devel %description The K Desktop Environment (KDE) is a GUI desktop for the X Window @@ -125,8 +129,6 @@ Requires: %{name} = %{version}-%{release} %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread -%patch100 -p1 - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -169,7 +171,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} +%__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} ## Remove/uninstall (conflicting) bits we don't want diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index c8b4a8c5f..670eb0e92 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -29,6 +29,7 @@ Summary: PIM (Personal Information Manager) applications Prefix: %{_prefix} Source0: kdepim-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tqtinterface BuildRequires: trinity-arts @@ -58,6 +59,7 @@ PIM (Personal Information Manager) applications. %package devel Requires: %{name} Summary: %{name} - Development files +Group: Development/Libraries %description devel Development files for %{name}. @@ -101,7 +103,7 @@ cd build %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{?buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build %clean %__rm -rf %{?buildroot} @@ -122,6 +124,7 @@ export PATH="%{_bindir}:${PATH}" %{_datadir}/config.kcfg/* %{_libdir}/lib*.so.* %{tde_libdir}/*.so +#%{tde_libdir}/*.so.* %{tde_libdir}/plugins/designer/*.so %{_datadir}/servicetypes/* %{_libdir}/kconf_update_bin/* diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec index 238fe5656..7458317d2 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec @@ -50,7 +50,7 @@ Provides: kdesdk3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -BuildRequires: automake libtool +BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: pcre-devel BuildRequires: trinity-kdelibs-devel @@ -66,7 +66,7 @@ BuildRequires: libxslt-devel libxml2-devel BuildRequires: binutils-devel %endif BuildRequires: perl -%{?_with_subversion:BuildRequires: subversion-devel neon-devel} +BuildRequires: subversion-devel neon-devel # Obsoletes/Provides %define cervisia_ver 2.4.7 @@ -99,7 +99,7 @@ Requires: trinity-kdelibs-devel %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs # helps multilib upgrades Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec index 19dae5b0b..2563ec93a 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec @@ -26,7 +26,10 @@ Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source: kdesdk-%{version}.tar.gz # RedHat Legacy patches @@ -48,7 +51,9 @@ BuildRequires: desktop-file-utils BuildRequires: flex # umbrello BuildRequires: libxslt-devel libxml2-devel +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 BuildRequires: binutils-devel +%endif BuildRequires: perl BuildRequires: subversion-devel neon-devel @@ -111,14 +116,15 @@ cd build -DBUILD_ALL=ON \ .. -%__make %{?_smp_mflags} +# Do not use %{?_smp_mflags} ! +%__make %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/kde \ diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec index 5e65d0712..5cf187ce2 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec @@ -79,6 +79,7 @@ Utilities for the Trinity Desktop Environment, including: * ktimer (task scheduler) * kwikdisk (removable media utility) + # afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex %package devel Summary: Development files for %{name} @@ -222,7 +223,6 @@ done %files extras %defattr(-,root,root,-) - # kmilo %{tde_libdir}/kded_kmilod.* %{tde_libdir}/kmilo* diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index 643344108..f58564dda 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -12,7 +12,8 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity @@ -20,34 +21,95 @@ Name: trinity-kdeutils Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL +Summary: TDE Utilities +Group: Applications/System + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Summary: Trinity KDE Utilities +URL: http://www.trinitydesktop.org/ + Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdeutils-%{version}.tar.gz +Source1: klaptop_acpi_helper.pam +Source2: klaptop_acpi_helper.console +Source3: kcmlaptoprc BuildRequires: tqtinterface BuildRequires: trinity-arts BuildRequires: trinity-kdelibs +# RedHat / Fedora legacy patches +Patch1: kdf-3.0.2-label.patch + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + Requires: tqtinterface Requires: trinity-kdelibs +BuildRequires: gettext +BuildRequires: net-snmp-devel +BuildRequires: python-devel +BuildRequires: gmp-devel +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libXScrnSaver-devel libXtst-devel +%endif +BuildRequires: xmms-devel + +%define superkaramba_ver 0.39 +Obsoletes: superkaramba < 0:%{superkaramba_ver} +Provides: superkaramba = 0:%{superkaramba_ver} + %description -Trinity KDE Utilities. +Utilities for the Trinity Desktop Environment, including: + * ark (tar/gzip archive manager) + * kcalc (scientific calculator) + * kcharselect (character selector) + * kdepasswd (change password) + * kdessh (ssh front end) + * kdf (view disk usage) + * kedit (simple text editor) + * kfloppy (floppy formatting tool) + * kgpg (gpg gui) + * khexedit (hex editor) + * kjots (note taker) + * kregexpeditor (regular expression editor) + * ktimer (task scheduler) + * kwikdisk (removable media utility) +# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex %package devel -Requires: %{name} -Summary: %{name} - Development files +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: %{name}-extras = %{version}-%{release} +Requires: trinity-kdelibs-devel %description devel Development files for %{name}. +%package extras +Summary: Extras packages from %{name} +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 +Requires: pm-utils +%endif +Requires: usermode +%description extras +More Utilities for the K Desktop Environment: + * kmilo + * ksim (system information monitor); + * klaptopdaemon (battery monitoring and management for laptops); + %prep %setup -q -n kdeutils +%patch1 -p1 -b .label + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -61,55 +123,220 @@ sed -i admin/acinclude.m4.in \ unset QTDIR || : ; source /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export LDFLAGS="${LDFLAGS} -lqt-mt -lkdeui -L${QTLIB}" %configure \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-debug --disable-warnings --enable-final \ - --with-xinerama \ - --with-extra-includes=%{_includedir}/tqt \ - --with-extra-libs=%{tde_libdir} \ - --enable-closure + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-debug --disable-warnings \ + --enable-final \ + --includedir=%{tde_includedir} \ + --with-snmp \ + --with-xscreensaver \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -%__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} export PATH="%{_bindir}:${PATH}" -%make_install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} + +# Show only in KDE (really? -- Rex) +for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \ + KCharSelect ark kwalletmanager kwalletconfig \ + irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do + if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then + echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop + fi +done + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + pushd $lang_dir/kcontrol + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common + done + popd + fi +done +fi + +# using pam +install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper +install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper + +pushd %{buildroot}%{_bindir} + mkdir -p %{buildroot}%{_sbindir} + mv klaptop_acpi_helper ../sbin + ln -s consolehelper klaptop_acpi_helper +popd + +# klaptop setting +install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc + %clean %__rm -rf %{?buildroot} -%files + +%post +/sbin/ldconfig +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +/sbin/ldconfig +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post extras +/sbin/ldconfig +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done + +%postun extras +/sbin/ldconfig +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done + + +%files extras +%defattr(-,root,root,-) +# kmilo +%{tde_libdir}/kded_kmilod.* +%{tde_libdir}/kmilo* +%{_libdir}/libkmilo.la +%{_libdir}/libkmilo.so.* +%{_datadir}/services/kded/kmilod.desktop +%{_datadir}/services/kmilo +%{_datadir}/servicetypes/kmilo + +# ksim +%doc %{_docdir}/HTML/*/ksim/ +%{tde_libdir}/ksim* +%{_libdir}/libksimcore.la +%{_libdir}/libksimcore.so.* +%{_datadir}/apps/kicker/extensions/ksim.desktop +%{_datadir}/apps/ksim/ +%config %{_datadir}/config/ksim_panelextensionrc +%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png +%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png + +# klaptop +%doc %{_docdir}/HTML/en/kcontrol +%{_sysconfdir}/pam.d/klaptop_acpi_helper +%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper +%{_bindir}/klaptop* +%{tde_libdir}/kded_klaptopdaemon.* +%{_sbindir}/klaptop_acpi_helper +%{_datadir}/apps/klaptopdaemon +%{_datadir}/services/kded/klaptopdaemon.desktop +%{tde_libdir}/kcm_laptop.* +%{_libdir}/libkcmlaptop.* +%{_datadir}/applications/kde/laptop.desktop +%config %{_datadir}/config/kcmlaptoprc +%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png +%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png +%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz + + +%files -f %{name}.lang %defattr(-,root,root,-) + +# kmilo +%exclude %{tde_libdir}/kded_kmilod.* +%exclude %{tde_libdir}/kmilo* +%exclude %{_libdir}/libkmilo.la +%exclude %{_libdir}/libkmilo.so.* +%exclude %{_datadir}/services/kded/kmilod.desktop +%exclude %{_datadir}/services/kmilo +%exclude %{_datadir}/servicetypes/kmilo + +# ksim +%exclude %{_docdir}/HTML/*/ksim/ +%exclude %{tde_libdir}/ksim* +%exclude %{_libdir}/libksimcore.la +%exclude %{_libdir}/libksimcore.so.* +%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop +%exclude %{_datadir}/apps/ksim/ +%exclude %{_datadir}/config/ksim_panelextensionrc +%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png +%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png + +# klaptop +%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper +%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper +%exclude %{_bindir}/klaptop* +%exclude %{tde_libdir}/kded_klaptopdaemon.* +%exclude %{_sbindir}/klaptop_acpi_helper +%exclude %{_datadir}/apps/klaptopdaemon +%exclude %{_datadir}/services/kded/klaptopdaemon.desktop +%exclude %{tde_libdir}/kcm_laptop.* +%exclude %{_libdir}/libkcmlaptop.* +%exclude %{_datadir}/applications/kde/laptop.desktop +%exclude %{_datadir}/config/kcmlaptoprc +%exclude %{_docdir}/HTML/en/kcontrol/ +%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png +%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png +%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz + +%attr(644,root,root) %{_sysconfdir}/security/console.apps/* +%attr(644,root,root) %{_sysconfdir}/pam.d/* %{_bindir}/* -%{_datadir}/applications/kde/*.desktop +%{_sbindir}/* +%{tde_libdir}/* +%{_libdir}/*.la +%{_libdir}/libkdeinit*.so +%{_libdir}/lib*.so.* +%{_datadir}/icons/*/*/*/* %{_datadir}/apps/* -%{_datadir}/autostart/*.desktop -%{_datadir}/config/* -%{_datadir}/icons/* -%{_datadir}/services/* +%config %{_datadir}/config/* %{_datadir}/config.kcfg/* -%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop -%{_libdir}/lib*.so.* -%{_libdir}/libkdeinit*.so -%{tde_libdir}/*.so -%{tde_docdir}/HTML/en/* - -%{_datadir}/applnk/*/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/applications/kde/* +%if 0%{?rhel} >= 5 || 0%{?fedora} +%{_datadir}/applnk/Utilities/* %{_datadir}/mimelnk/application/* - +%endif +%{_datadir}/autostart/* +%doc %lang(en) %{_docdir}/HTML/en/* %files devel %defattr(-,root,root,-) -%{_libdir}/*.la -%{_libdir}/*.so -%{_includedir}/* -%{tde_libdir}/*.la +%{tde_includedir}/* +%{_libdir}/libkcmlaptop.so +%{_libdir}/libkhexeditcommon.so +%{_libdir}/libkmilo.so +%{_libdir}/libkregexpeditorcommon.so +%{_libdir}/libksimcore.so + %changelog * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 diff --git a/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch new file mode 100644 index 000000000..590aa40bf --- /dev/null +++ b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch @@ -0,0 +1,11 @@ +--- kdevelop/kdevdesigner/designer/listeditor.ui.h.ORI 2011-10-30 13:30:56.655489268 +0100 ++++ kdevelop/kdevdesigner/designer/listeditor.ui.h 2011-10-30 13:31:00.782489292 +0100 +@@ -30,7 +30,7 @@ + { + QListViewItem *i = new QListViewItem( listview, listview->lastItem() ); + i->setRenameEnabled( 0, TRUE ); +- tqApp->processEvents(); ++ qApp->processEvents(); + i->startRename( 0 ); + } + diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec index a7504fbe2..6d963ec74 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec @@ -143,7 +143,7 @@ Requires: %{name} = %{version}-%{release} %build -QTDIR="" && source /etc/profile.d/qt.sh +unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" @@ -184,7 +184,6 @@ popd %install %__rm -rf %{buildroot} - %__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0 diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index 32aef0d43..a3101cdf7 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -11,6 +11,7 @@ %endif # TDE 3.5.13 specific variables +BuildRequires: cmake >= 2.8 %define tde_libdir %{_libdir}/trinity %define _default_patch_fuzz 2 @@ -24,10 +25,14 @@ Release: %{?release}%{?dist}%{?_variant} License: GPLv2 -URL: http://www.kdevelop.org/ Group: Development/Tools -Prefix: %{_prefix} +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) Source: kdevelop-%{version}.tar.gz Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 @@ -35,7 +40,10 @@ Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD # RedHat Legacy patches Patch1: c_cpp_reference-2.0.2-config.patch -Patch100: svn.patch +# TDE 3.5.13 patches +## RHEL / Fedora RPM specific patches +Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch + Provides: kdevelop3 = %{version}-%{release} @@ -45,14 +53,13 @@ Requires: %{name}-libs = %{version}-%{release} Requires: trinity-kdelibs-devel Requires: make Requires: perl -#Requires: automake libtool Requires: flex >= 2.5.4 Requires: qt3-designer Requires: gettext Requires: ctags -#BuildRequires: automake libtool -BuildRequires: cmake >= 2.8 +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-apidocs BuildRequires: qt3-devel-docs @@ -116,8 +123,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n kdevelop -a1 %patch1 -p0 -b .config - -%patch100 -p1 +%patch2 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! |