rpms/kdebase3/devel kdebase3.spec,1.87,1.88
Than Ngo
than at fedoraproject.org
Fri Sep 4 22:45:45 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7644
Modified Files:
kdebase3.spec
Log Message:
* drop support fedora < 10
Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kdebase3.spec 4 Sep 2009 21:34:30 -0000 1.87
+++ kdebase3.spec 4 Sep 2009 22:45:44 -0000 1.88
@@ -7,6 +7,7 @@
%define arts 1
%define libs 1
+%define _with_libutempter 1
%define _with_samba --with-samba
Version: 3.5.10
@@ -106,38 +107,10 @@ Requires: psmisc
Requires: eject
%endif
-%if "%{name}" == "kdebase"
-# upgrade path for former kde-redhat'ers
-Obsoletes: %{name}-kdm < %{epoch}:%{version}-%{release}
-Provides: %{name}-kdm = %{epoch}:%{version}-%{release}
-# when/if -kdm is ever packaged separately
-Requires: kde-settings-kdm
-
-# See http://bugzilla.redhat.com/191306
-Requires(hint): htdig
-# man2html
-Requires(hint): man
-
-# startkde references: df mktemp test which xargs xmessage xprop xrandr xrdb xset xsetroot
-Requires: coreutils
-Requires: findutils
-Requires: mktemp
-Requires: which
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-Requires: xorg-x11-apps
-Requires: xorg-x11-utils
-Requires: xorg-x11-server-utils
-%endif
-%endif
-
-BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: kdelibs3-devel >= %{version}-16
BuildRequires: libxslt-devel libxml2-devel
%if 0%{?_with_samba:1}
-%if 0%{?fedora} > 6
BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba
-%endif
%endif
BuildRequires: pam-devel
BuildRequires: gettext
@@ -148,7 +121,6 @@ BuildRequires: automake libtool
%endif
BuildRequires: pkgconfig
BuildRequires: doxygen
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%ifarch %{ix86} x86_64 ia64 ppc ppc64
%define _with_suspend 1
Requires: pm-utils
@@ -156,7 +128,6 @@ Requires: pm-utils
%define _with_hal --with-hal
# dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
BuildRequires: dbus-devel hal-devel
-%endif
BuildRequires: bzip2-devel
BuildRequires: freetype-devel
BuildRequires: openldap-devel
@@ -164,7 +135,6 @@ BuildRequires: cyrus-sasl-devel
BuildRequires: libart_lgpl-devel
## X11 support details (xmkmf, bdftopcf)
BuildRequires: xorg-x11-font-utils
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: imake
BuildRequires: xorg-x11-proto-devel
BuildRequires: libfontenc-devel
@@ -179,46 +149,22 @@ BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXxf86misc-devel
BuildRequires: libxkbfile-devel
-%endif
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-# See also http://bugzilla.redhat.com/205767
-%define _with_libutempter 1
-%endif
%ifnarch s390 s390x
BuildRequires: libraw1394-devel
BuildRequires: libusb-devel
-%if 0%{?fedora} < 9
-BuildRequires: lm_sensors-devel
-%endif
%endif
BuildRequires: OpenEXR-devel
BuildRequires: gtk2-devel
-%if "%{name}" == "kdebase"
-%description
-Core applications for the K Desktop Environment. Included are: kdm
-(replacement for xdm), kwin (window manager), konqueror (filemanager,
-web browser, ftp client, ...), konsole (xterm replacement), kpanel
-(application starter and desktop pager), kaudio (audio server),
-kdehelp (viewer for kde help files, info and man pages), kthememgr
-(system for managing alternate theme packages) plus other KDE
-components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind,
-kfontmanager, kmenuedit).
-%else
%description
Core runtime files for the K Desktop Environment 3, for compatibility with KDE 3
applications.
-%endif
# FIXME/TODO: Is kdebase3-devel really useful?
%package devel
Summary: Development files for %{name}
-%if "%{name}" == "kdebase"
-Provides: kdebase3-devel = %{version}-%{release}
-%else
Provides: kdebase-devel = 6:%{version}-%{release}
Obsoletes: kdebase-devel < 6:%{version}-%{release}
-%endif
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdelibs3-devel
Group: Development/Libraries
@@ -245,15 +191,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: kdelibs3 >= %{version}
-%if "%{name}" == "kdebase"
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
-%else
Obsoletes: kdebase-libs < 6:%{version}-%{release}
Provides: kdebase-libs = 6:%{version}-%{release}
# helps multilib upgrades
Obsoletes: kdebase < 6:%{version}-%{release}
-%endif
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
@@ -300,17 +241,11 @@ Protocol handlers (KIOslaves) for person
%patch28 -p1 -b .kdm-alternatebackground
%patch30 -p1 -b .bz#265801
%patch31 -p1 -b .konsolesu-kdesu
-%if 0%{?fedora} > 7
%patch36 -p1 -b .userdiskmount
-%endif
-%if "%{name}" != "kdebase"
-# F9+ only - we do want to runRdb on F8
%patch37 -p1 -b .libkrdb_dep
-%endif
%patch100 -p1 -b .minicli-decimal-comma
%patch101 -p1 -b .ossl-1.x
-%if "%{name}" != "kdebase"
# hacks to omit stuff that doesn't support DO_NOT_COMPILE
# colors is pending on http://bugzilla.redhat.com/443343
sed -i.omit -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' \
@@ -320,7 +255,6 @@ sed -i.omit -e 's|^FONTINST_SUBDIR=kfont
-e 's/locale//' \
-e 's/screensaver//' -e 's/style//' -e 's/taskbar//' -e 's/xinerama//' \
kcontrol/Makefile.am
-%endif
# security fixes
@@ -344,7 +278,6 @@ install -p -m644 %{SOURCE9} %{SOURCE10}
# set some default enviroments
unset QTDIR && . /etc/profile.d/qt.sh
-%if "%{name}" != "kdebase"
export DO_NOT_COMPILE="kappfinder kdesktop kdesu klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin"
export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb"
@@ -352,7 +285,6 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE k
# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves
# kate for kscope
# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
-%endif
%configure \
--enable-new-ldflags \
@@ -402,10 +334,6 @@ rm -rf %{buildroot}
make RUN_KAPPFINDER=no DESTDIR=%{buildroot} install
-%if "%{name}" == "kdebase"
-install -p -m755 mailsettings %{buildroot}%{_bindir}/
-%endif
-
# Nuke man2html - we get it from man
find %{buildroot} -name "man2html*" | xargs rm -rf
@@ -462,43 +390,6 @@ rm -f %{buildroot}%{_datadir}/fonts/over
# now in kde-filesystem (see #321771)
rm -f %{buildroot}%{_datadir}/applnk/.hidden/.directory
-%if "%{name}" == "kdebase"
-
-install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
-
-# xsession support
-mkdir -p %{buildroot}%{_datadir}/xsessions/
-ln -s %{_datadir}/apps/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
-
-# install logrotate script
-install -p -m 644 -D %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
-
-# own %{_datadir}/apps/kdm/faces
-mkdir -p %{buildroot}%{_datadir}/apps/kdm/faces
-pushd %{buildroot}%{_datadir}/apps/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
-popd
-
-## install pam configuration files
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
-%else
-install -p -m644 -D %{SOURCE50} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
-%endif
-
-# create/own /var/lib/kdm/kdmsts (#442081)
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm/kdmsts
-
-%else
-# FIXME/TODO: initial removal. Check if the simple rm breaks anything.
-
# remove conflicts with kdebase-workspace
pushd %{buildroot}%{_bindir}
rm -f genkdmconf kaccess kappfinder kapplymousetheme kate kbookmarkmerger \
@@ -587,7 +478,6 @@ rm -rf %{buildroot}%{_datadir}/apps/apps
rm -rf %{buildroot}%{_datadir}/apps/ksmserver
rm -rf %{buildroot}%{_datadir}/applnk
rm -rf %{buildroot}/etc/xdg/menus/
-%endif
%clean
rm -rf %{buildroot}
More information about the fedora-extras-commits
mailing list