From bca7b432a75bf6ecfd46b10ef8482f3dbf900645 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 18 Sep 2011 23:25:11 +0200 Subject: Updates for TDE 3.5.12 under Fedora 15 and RHEL 5 --- redhat/dependencies/arts/trinity-arts-3.5.12.spec | 15 +++-- .../tqtinterface/tqtinterface-3.5.12.spec | 30 ++++++++-- redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec | 7 ++- redhat/kdebase/trinity-kdebase-3.5.12.spec | 51 +++++++++++----- redhat/kdebindings/trinity-kdebindings-3.5.12.spec | 41 +++++++------ redhat/kdelibs/trinity-kdelibs-3.5.12.spec | 67 ++++++++++++++++------ redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec | 2 +- redhat/kdevelop/trinity-kdevelop-3.5.12.spec | 11 +++- 8 files changed, 163 insertions(+), 61 deletions(-) diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec index 4b6fcfe1a..1a72133d6 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 5 +%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" @@ -24,8 +24,10 @@ Vendor: Trinity Project URL: http://www.trinitydesktop.org/ Packager: Francois Andriot -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 @@ -69,7 +71,7 @@ Development files for %{name} %setup -q -n dependencies/arts %__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/"*"/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build @@ -84,12 +86,14 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" --disable-libmad \ --with-alsa \ --enable-final \ + --enable-closure \ --with-extra-includes=%{_includedir}/tqt %__make %{?_smp_mflags} %install -%make_install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} %clean %__rm -rf %{?buildroot} @@ -123,6 +127,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %changelog +* Fri Sep 16 2011 Francois Andriot - 3.5.12-6 +- Add support for RHEL 5. + * Mon Sep 12 2011 Francois Andriot - 3.5.12-5 - Add "Group" field diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec index 79102f528..e0bf6b56c 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec @@ -2,21 +2,28 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 8 +%define release 9 # 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 %endif +# 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 + + # TQT include files may conflict with QT4 includes, so we move them to a subdirectory. # Later compiled Trinity products should be aware of that ! %define _includedir %{_prefix}/include/tqt # TDE 3.5.12 specific building variables BuildRequires: autoconf automake libtool m4 -BuildRequires: qt3-devel >= 3.3.8b -Requires: qt3 >= 3.3.8b +BuildRequires: qt%{?_qt_suffix}-devel >= 3.3.8b +Requires: qt%{?_qt_suffix} >= 3.3.8b Name: tqtinterface @@ -31,8 +38,10 @@ URL: http://www.trinitydesktop.org/ Packager: Francois Andriot Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz +Patch0: tqtinterface-3.5.12-qtinterface-makefile.patch BuildRequires: gcc-c++ BuildRequires: libXi-devel @@ -52,9 +61,10 @@ Development files for %{name} %prep %setup -q -n dependencies/%{name} +%patch0 -p1 %__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/"*"/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build @@ -71,7 +81,14 @@ CFLAGS=$( pkg-config --libs qt-mt ) %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot}%{_includedir} -%make_install +%__make install DESTDIR=%{?buildroot} + +# 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 %clean %__rm -rf %{?buildroot} @@ -87,6 +104,9 @@ CFLAGS=$( pkg-config --libs qt-mt ) %changelog +* Fri Sep 16 2011 Francois Andriot - 3.5.12-9 +- Add support for RHEL 5. + * Mon Sep 12 2011 Francois Andriot - 3.5.12-8 - Add "Group" diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec index 83f0aafe0..bdbdf31af 100644 --- a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec @@ -92,6 +92,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive" %__make %{?_smp_mflags} %install +export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %make_install @@ -173,11 +174,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %endif %{_datadir}/apps/* %{_datadir}/applications/kde/*.desktop -#%{_datadir}/config*/* -#%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/config*/* +%{_datadir}/icons/crystalsvg/*/*/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/locolor/*/*/* -#%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/mimelnk/*/*.desktop %{_datadir}/service*/*.desktop %{tde_libdir}/* %{_libdir}/pkgconfig/*.pc diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index 9616f45d6..b3df6b097 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 10 +%define release 11 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -15,6 +15,12 @@ BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir} %define tde_libdir %{_libdir}/kde3 +# 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} @@ -28,6 +34,7 @@ Packager: Francois Andriot URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdebase-%{version}.tar.gz @@ -59,11 +66,13 @@ Patch3: kdebase-3.5.12-kdesu-noignorebutton.patch Patch5: kdebase-3.5.12-desktop-openterminalhere.patch # [kdebase/kioslave]: Forces HAL backend to use HAL mount options Patch6: kdebase-3.5.12-halmountoptions.patch +# [kdebase/kcontrol]: disable components that depends of krandr (old distros) +Patch10: kdebase-3.5.12-disable-krandr.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel -BuildRequires: qt3-devel >= 3.3.8b +BuildRequires: qt%{?_qt_suffix}-devel BuildRequires: openssl-devel BuildRequires: avahi-devel avahi-qt3-devel BuildRequires: imake @@ -74,7 +83,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 @@ -82,11 +91,14 @@ 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 Requires: tqtinterface Requires: trinity-arts Requires: trinity-kdelibs -Requires: qt3 >= 3.3.8b +Requires: qt%{?_qt_suffix} Requires: openssl Requires: avahi avahi-qt3 @@ -110,11 +122,11 @@ kfontmanager, kmenuedit). %package devel Requires: %{name} -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +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 @@ -126,7 +138,7 @@ Kate plugins or KWin styles. %package extras Summary: Extra applications from %{name} Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description extras %{summary}, including: * kappfinder @@ -140,9 +152,9 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries Requires: trinity-kdelibs >= %{version} %if "%{?_prefix}" == "/usr" -Obsoletes: kdebase3-libs +Obsoletes: kdebase%{?_qt_suffix}-libs %endif -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description libs %{summary} @@ -170,9 +182,12 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch7 -p1 %patch8 -p1 %patch9 -p1 +%if 0%{?rhel} && 0%{?rhel} < 6 +%patch10 -p1 +%endif %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build @@ -196,6 +211,7 @@ export IMAKEINCLUDE="-I/usr/share/X11/config" --with-xinerama \ --with-xscreensaver \ --without-shadow \ + --enable-closure \ --with-extra-includes=%{_includedir}/tqt # Do NOT use %{?_smp_mflags} for this package, or it will fail to build ! @@ -203,8 +219,7 @@ export IMAKEINCLUDE="-I/usr/share/X11/config" %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install +%__make install DESTDIR=%{?buildroot} # Adds a GDM/KDM/XDM session called 'TDE' %if "%{?_prefix}" != "/usr" @@ -344,7 +359,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 @@ -392,7 +406,10 @@ 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 %{_bindir}/kompmgr +%endif %{_bindir}/kpm %{_bindir}/ksplash %{_libdir}/kconf_update_bin @@ -425,7 +442,11 @@ 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 @@ -478,6 +499,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libkdeinit_*.* %changelog +* Fri Sep 16 2011 Francois Andriot - 3.5.12-11 +- Add support for RHEL 5. +- Remove file conflicts with KDE 4.6.5 under Fedora 15 + * Mon Sep 12 2011 Francois Andriot - 3.5.12-10 - Add "Group" field diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec index fe7565d72..3e654a49f 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -14,6 +14,7 @@ BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir} %define tde_libdir %{_libdir}/kde3 +%define tde_includedir %{_includedir}/kde Name: trinity-kdebindings @@ -30,6 +31,10 @@ URL: http://developer.kde.org/language-bindings/ 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 @@ -43,6 +48,7 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: zlib-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: trinity-arts-devel +BuildRequires: glib-devel gtk+-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)} @@ -63,12 +69,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} @@ -114,7 +124,7 @@ unset JAVA_HOME ||: export DO_NOT_COMPILE="$DO_NOT_COMPILE python" %configure \ - --includedir=%{_includedir}/kde \ + --includedir=%{tde_includedir} \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ @@ -146,10 +156,10 @@ popd %install -%__rm -rf $RPM_BUILD_ROOT export PATH="%{_bindir}:${PATH}" +%__rm -rf $RPM_BUILD_ROOT -%make_install \ +%__make install DESTDIR=%{?buildroot} \ PYTHON=%{__python} desktop-file-install \ @@ -199,7 +209,7 @@ for dir in dcopperl dcoppython kalyptus %{?_with_java:kdejava qtjava} kjsembed k done %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig ||: @@ -239,11 +249,7 @@ 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.* # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" @@ -265,15 +271,14 @@ 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 +* Sun Sep 18 2011 Francois Andriot - 3.5.12-4 +- Add RHEL5 support +- Add 'ruby_arch' macro to avoid handling distro-specific ruby path + * Sun Sep 04 2011 Francois Andriot - 3.5.12-3 - Import to GIT diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec index b81d77cb5..6207fc5c1 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 6 +%define release 8 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -15,39 +15,52 @@ BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir} %define tde_libdir %{_libdir}/kde3 +# 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 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: 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 - -Requires: tqtinterface -Requires: trinity-arts -Requires: qt3 -Requires: avahi avahi-qt3 +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: qt%{?_qt_suffix}-devel +BuildRequires: avahi-qt3-devel + +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 @@ -63,7 +76,7 @@ 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 @@ -75,7 +88,7 @@ Group: Development/Libraries Summary: %{name} - API documentation Requires: %{name} = %{version}-%{release} %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3-apidocs-devel +Obsoletes: kdelibs%{?_qt_suffix}-apidocs-devel %endif %description apidocs @@ -86,7 +99,7 @@ format for easy browsing %setup -q -n kdelibs %__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/"*"/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -96,6 +109,12 @@ export PATH="%{_bindir}:${PATH}" export LD_LIBRARY_PATH="%{_libdir}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" +# On older RHEL, libXrandr is too old so krandr cannot be compiled. +# Kspell2 does not compile either. +%if 0%{?rhel} && 0%{?rhel} < 6 +export DO_NOT_COMPILE="krandr" +%endif + %configure \ --disable-rpath \ --enable-new-ldflags \ @@ -117,6 +136,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" --with-jasper \ --with-openexr \ --with-xinerama \ + --enable-closure \ --with-extra-includes=%{_includedir}/tqt # Do NOT use %{?_smp_mflags} for this package, or it will fail to build ! @@ -125,8 +145,15 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install +%__make install DESTDIR=%{?buildroot} + +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%if "%{?_prefix}" != "/usr" +%{_libdir} +%endif +%{tde_libdir} +EOF %clean @@ -239,6 +266,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %exclude %{_datadir}/locale/all_languages %exclude %{tde_docdir}/HTML/en/common/* %endif +%{_sysconfdir}/ld.so.conf.d/trinity.conf # Provided by 'redhat-menus' package %exclude %{_sysconfdir}/xdg/menus/applications.menu @@ -261,6 +289,13 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %changelog +* Fri Sep 16 2011 Francois Andriot - 3.5.12-8 +- Add support for RHEL 5. + +* Thu Sep 15 2011 Francois Andriot - 3.5.12-7 +- Add missings 'BuildRequires' +- Re-add lost 'ld.so.conf' file + * Mon Sep 12 2011 Francois Andriot - 3.5.12-6 - Add "Group" field diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec index 9ab8491bc..c802d72bf 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec @@ -204,7 +204,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %{?_with_xmms} %{!?_with_xmms:--without-xmms} \ --with-extra-includes=%{_includedir}/tqt -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec index d7ca3a9fe..4d70451ba 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec @@ -59,11 +59,16 @@ Requires: qt3-designer Requires: gettext Requires: ctags +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-apidocs BuildRequires: qt3-devel-docs BuildRequires: db4-devel -BuildRequires: flex +BuildRequires: flex flex-static +BuildRequires: pcre-devel +BuildRequires: libacl-devel libattr-devel libidn-devel libart_lgpl-devel +BuildRequires: gcc-c++ # FIXME: No CVS support in KDevelop? This is going to suck... # Requires kdesdk3. BuildRequires: trinity-kdesdk-devel @@ -141,6 +146,10 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" # Fix KDE detection fail in "./configure" because tqt.h cannot be found export CXXFLAGS="${CXXFLAGS} -I%{_includedir}/tqt" +%if 0%{?fedora} >= 15 +export CXXFLAGS="${CXXFLAGS} -fpermissive" +%endif + # c references pushd c_cpp_reference-2.0.2_for_KDE_3.0 %configure \ -- cgit v1.2.3