Attachment 262031 Details for Bug 374531 – Diff from the current kdebase4 specfile

[patch] Diff from the current kdebase4 specfile

kdebase-runtime.spec.diff (text/plain), 5.53 KB, created by Kevin Kofler on 2007-11-17 00:39:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Kofler

Created: 2007-11-17 00:39:33 UTC

Size: 5.53 KB

patch

obsolete

>--- fedoracvs/kdebase4/devel/kdebase4.spec	2007-10-25 05:00:09.000000000 +0200
>+++ kde4/kdebase-runtime.spec	2007-11-17 01:29:12.000000000 +0100
>@@ -1,26 +1,18 @@
> 
>-Summary:       K Desktop Environment 4 - Core Files
>-Version:       3.94.0
>-Release:       2%{?dist}
>-
>-%if 0%{?fedora} > 9
>-Name:          kdebase
>-Epoch:         6
>-
>-Obsoletes:     kdebase4 < %{version}-%{release}
>-Provides:      kdebase4 = %{version}-%{release}
>-
>-%else
>-Name:          kdebase4
>-%endif
>+Name:          kdebase-runtime
>+Summary:       K Desktop Environment - Runtime 
>+Version:       3.96.0
>+Release:       1%{?dist}
> 
> License:       GPLv2
> Group:         User Interface/Desktops
> URL:           http://www.kde.org/
>-Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
>-Patch0:        kdebase-3.94.0-dolphin-desktop.diff
>+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
> BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>+Obsoletes: kdebase4-runtime < %{version}-%{release}
>+Provides:  kdebase4-runtime = %{version}-%{release}
>+
> BuildRequires: kde-filesystem
> %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
> Requires(post): /sbin/ldconfig xdg-utils
>@@ -31,77 +23,37 @@
> Requires: eject
> %endif
> 
>-# should not conflict with d3lphin, but does with old Dolphin
>-Conflicts:     dolphin <= 0.8.2
>+Provides: oxygen-icon-theme = %{version}-%{release}
> 
> BuildRequires: alsa-lib-devel
>-BuildRequires: bzip2-devel
>-# needed?
>-BuildRequires: cdparanoia-devel cdparanoia
> BuildRequires: cmake
>-BuildRequires: cyrus-sasl-devel
>-BuildRequires: doxygen
>-BuildRequires: fontconfig-devel
>-BuildRequires: gettext
>+BuildRequires: giflib-devel
> BuildRequires: hal-devel
> BuildRequires: kdelibs4-devel >= %{version}
> BuildRequires: kdepimlibs-devel >= %{version}
>-# needed?
>-BuildRequires: libart_lgpl-devel
>-# needed?
>-BuildRequires: libfontenc-devel
>-BuildRequires: libusb-devel
> BuildRequires: OpenEXR-devel
>-# needed?
>-BuildRequires: openldap-devel
> BuildRequires: openssl-devel
>+BuildRequires: pcre-devel
> BuildRequires: pkgconfig
> BuildRequires: qimageblitz-devel
>-# samba support
>-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
>-BuildRequires: libsmbclient-devel
>-%else
>-BuildRequires: samba
>-%endif
>-BuildRequires: soprano-devel
>-BuildRequires: strigi-devel
>+BuildRequires: soprano-devel >= 1.97.1
>+BuildRequires: strigi-devel >= 0.5.7
> BuildRequires: xine-lib-devel
>-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
>-%if 0%{?fedora} >= 8
>-BuildRequires:  libxcb-devel
>-%endif
>+# phonon-xine VideoWidget need xine-lib built with libxcb support
>+BuildRequires: xine-lib-devel libxcb-devel
> # needed?
> BuildRequires: xorg-x11-font-utils
> BuildRequires: xorg-x11-proto-devel
> BuildRequires: zlib-devel
>-# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
>-BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
> 
> %description
>-Core runtime requirements and applications for the K Desktop Environment 4.
>+Core runtime for the K Desktop Environment 4.
> This package does not include the KDE 4 versions of applications which are
> provided by KDE 3 because of file and configuration setting conflicts.
>-WARNING: This is a beta version. It probably has many bugs left.
>-Also, the API and ABI are NOT fully stable yet (soft freeze only).
>-
>-%package devel
>-Group:    Development/Libraries
>-Summary:  Header files for kdebase4
>-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
>-%if "%{name}" != "kdebase4"
>-Obsoletes: kdebase4-devel < %{version}-%{release}
>-Provides:  kdebase4-devel = %{version}-%{release}
>-%endif
>-Requires: kdelibs4-devel kdepimlibs4-devel
>-%description devel
>-Header files for developing applications using %{name}.
>-WARNING: This is a beta version. It probably has many bugs left.
>-Also, the API and ABI are NOT fully stable yet (soft freeze only).
> 
> 
> %prep
>-%setup -q -n kdebase-%{version}
>-%patch0 -p1
>+%setup -q -n kdebase-runtime-%{version}
> 
> 
> %build
>@@ -194,23 +146,6 @@
> rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
> rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
> 
>-# move devel symlinks
>-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
>-pushd %{buildroot}%{_kde4_libdir}
>-for i in lib*.so
>-do
>-  case "$i" in
>-    libkdeinit4_*.so)
>-      ;;
>-    *)
>-      linktarget=`readlink "$i"`
>-      rm -f "$i"
>-      ln -sf "../../$linktarget" "kde4/devel/$i"
>-      ;;
>-  esac
>-done
>-popd
>-
> 
> %clean
> rm -rf %{buildroot}
>@@ -230,7 +165,6 @@
> %files
> %defattr(-,root,root,-)
> %{_kde4_bindir}/*
>-%{_kde4_datadir}/applications/kde4/*
> %{_kde4_appsdir}/*
> %{_kde4_datadir}/config.kcfg/
> %{_datadir}/dbus-1/interfaces/*
>@@ -240,18 +174,24 @@
> %{_kde4_datadir}/kde4/servicetypes/*
> %{_kde4_datadir}/sounds/*
> %{_kde4_docdir}/HTML/en/
>-%{_kde4_libdir}/lib*.so.*
> %{_kde4_libdir}/libkdeinit4_*.so
> %{_kde4_libdir}/kde4/*
>-%exclude %{_kde4_libdir}/kde4/devel/
>-
>-%files devel
>-%defattr(-,root,root,-)
>-%{_kde4_includedir}/*
>-%{_kde4_libdir}/kde4/devel/lib*.so
>+%{_mandir}/man1/*
> 
> 
> %changelog
>+* Thu Nov 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-1
>+- kde-3.96.0
>+
>+* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.2-1
>+- kdebase-runtime-3.95.2
>+
>+* Wed Nov 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.0-1
>+- kdebase-runtime-3.95.0
>+
>+* Fri Nov 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.94.0-3
>+- Provides: oxygen-icon-theme ...
>+
> * Thu Oct 25 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.94.0-2
> - patch dolphin.desktop to get Dolphin to start from the menu
>

Actions: View | Diff

Attachments on bug 374531: 262031