summaryrefslogtreecommitdiffstats
path: root/redhat/kdelibs
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/kdelibs')
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.12.spec46
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec28
2 files changed, 62 insertions, 12 deletions
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 6207fc5c1..30cb449a1 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 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"
@@ -37,6 +37,7 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdelibs-%{version}.tar.gz
+Patch0: kdelibs-3.5.13-maxlinelength.patch
BuildRequires: libtool
BuildRequires: tqtinterface-devel
@@ -52,6 +53,11 @@ BuildRequires: alsa-lib-devel
BuildRequires: libidn-devel
BuildRequires: qt%{?_qt_suffix}-devel
BuildRequires: avahi-qt3-devel
+BuildRequires: jasper-devel
+BuildRequires: libtiff-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: glib2-devel
Requires: tqtinterface
Requires: trinity-arts
@@ -59,8 +65,10 @@ Requires: avahi
Requires: qt%{?_qt_suffix}
Requires: avahi-qt3
+
+Provides: kdelibs%{?_qt_suffix} = %{version}
%if "%{?_prefix}" == "/usr"
-Obsoletes: kdelibs%{?_qt_suffix}
+Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10
%endif
%description
@@ -75,8 +83,9 @@ kimgio (image manipulation).
Summary: %{name} - Development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Provides: kdelibs%{?_qt_suffix}-devel = %{version}
%if "%{?_prefix}" == "/usr"
-Obsoletes: kdelibs%{?_qt_suffix}-devel
+Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10
%endif
%description devel
@@ -87,19 +96,22 @@ applications for TDE.
Group: Development/Libraries
Summary: %{name} - API documentation
Requires: %{name} = %{version}-%{release}
+Provides: kdelibs%{?_qt_suffix}-apidocs = %{version}
%if "%{?_prefix}" == "/usr"
-Obsoletes: kdelibs%{?_qt_suffix}-apidocs-devel
+Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10
%endif
%description apidocs
This package includes the TDE API documentation in HTML
format for easy browsing
+
%prep
%setup -q -n kdelibs
+%patch0 -p1
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -155,6 +167,16 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{tde_libdir}
EOF
+# Moves the XDG configuration files to TDE directory
+%if "%{_prefix}" != "/usr"
+%__install -p -D -m644 \
+ "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
+ "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
+%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
+%else
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+%endif
+
%clean
%__rm -rf %{?buildroot}
@@ -268,8 +290,12 @@ EOF
%endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf
-# Provided by 'redhat-menus' package
-%exclude %{_sysconfdir}/xdg/menus/applications.menu
+# Avoid conflict with 'redhat-menus' package
+%if "%{_prefix}" == "/usr"
+%{_sysconfdir}/xdg/menus/kde-applications.menu
+%else
+%{_prefix}/etc/xdg/menus/kde-applications.menu
+%endif
%files devel
%defattr(-,root,root,-)
@@ -289,6 +315,12 @@ EOF
%changelog
+* Sun Nov 29 2911 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
+- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
+- Disable 'max line length' detection
+- Add missing BuildRequires
+- Disable 'max line length' detection
+
* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
- Add support for RHEL 5.
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index abbb9a047..faea11948 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%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"
@@ -37,6 +37,7 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdelibs-%{version}.tar.gz
+Patch0: kdelibs-3.5.13-maxlinelength.patch
BuildRequires: libtool
BuildRequires: tqtinterface-devel
@@ -64,8 +65,10 @@ Requires: avahi
Requires: qt%{?_qt_suffix}
Requires: avahi-qt3
+
+Provides: kdelibs%{?_qt_suffix} = %{version}
%if "%{?_prefix}" == "/usr"
-Obsoletes: kdelibs%{?_qt_suffix}
+Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10
%endif
%description
@@ -80,8 +83,9 @@ kimgio (image manipulation).
Summary: %{name} - Development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Provides: kdelibs%{?_qt_suffix}-devel = %{version}
%if "%{?_prefix}" == "/usr"
-Obsoletes: kdelibs%{?_qt_suffix}-devel
+Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10
%endif
%description devel
@@ -92,8 +96,9 @@ applications for TDE.
Group: Development/Libraries
Summary: %{name} - API documentation
Requires: %{name} = %{version}-%{release}
+Provides: kdelibs%{?_qt_suffix}-apidocs = %{version}
%if "%{?_prefix}" == "/usr"
-Obsoletes: kdelibs%{?_qt_suffix}-apidocs-devel
+Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10
%endif
%description apidocs
@@ -103,6 +108,8 @@ format for easy browsing
%prep
%setup -q -n kdelibs
+%patch0 -p1
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -146,11 +153,14 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
EOF
# Moves the XDG configuration files to TDE directory
+%if "%{_prefix}" != "/usr"
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
"%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-
+%else
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+%endif
%clean
@@ -266,7 +276,11 @@ EOF
%{_sysconfdir}/ld.so.conf.d/trinity.conf
# Avoid conflict with 'redhat-menus' package
+%if "%{_prefix}" == "/usr"
+%{_sysconfdir}/xdg/menus/kde-applications.menu
+%else
%{_prefix}/etc/xdg/menus/kde-applications.menu
+%endif
# New in TDE 3.5.13
%{_bindir}/kdetcompmgr
@@ -292,6 +306,10 @@ EOF
%changelog
+* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Add 'Provides: kdelibs3' to avoid installing distro-provided KDE3 libraries
+- Disable 'max line length' detection
+
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-18 10:24:07 +0000