rpms/kdebase/devel kdebase-3.4.2-npapi-64bit-fixes.patch, NONE, 1.1 env.sh, 1.4, 1.5 kdebase.spec, 1.249, 1.250
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue May 15 19:12:28 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22450
Modified Files:
env.sh kdebase.spec
Added Files:
kdebase-3.4.2-npapi-64bit-fixes.patch
Log Message:
* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-8
- cleanup/simplify scriptlets
- drop Req/Prov's that include %_arch (they don't work)
- Req: +samba-common
- BR: +OpenEXR-devel, -cdparanoia
- env.sh: use XDG_MENU_PREFIX
- npapi-64bit-fixes.patch
kdebase-3.4.2-npapi-64bit-fixes.patch:
--- NEW FILE kdebase-3.4.2-npapi-64bit-fixes.patch ---
--- kdebase-3.4.2/nsplugins/sdk/npapi.h.npapi-64bit-fixes 2005-05-23 14:14:25.000000000 +0200
+++ kdebase-3.4.2/nsplugins/sdk/npapi.h 2006-11-13 10:49:45.000000000 +0100
@@ -58,7 +58,7 @@
typedef unsigned short uint16;
#endif
#ifndef _UINT32
-#if defined(__alpha)
+#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
typedef unsigned int uint32;
#else /* __alpha */
typedef unsigned long uint32;
@@ -68,7 +68,7 @@ typedef unsigned long uint32;
typedef short int16;
#endif
#ifndef _INT32
-#if defined(__alpha) || defined(_AIX)
+#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
typedef int int32;
#else /* __alpha || _AIX */
typedef long int32;
Index: env.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/env.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- env.sh 1 Oct 2006 20:35:03 -0000 1.4
+++ env.sh 15 May 2007 19:11:53 -0000 1.5
@@ -1,6 +1,13 @@
-# from http://standards.freedesktop.org/menu-spec/latest/
+## from http://standards.freedesktop.org/menu-spec/latest/
+
# XDG_CONFIG_DIRS: where to look for menu config(s)
if [ -z "${XDG_CONFIG_DIRS}" ] ; then
XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
export XDG_CONFIG_DIRS
fi
+
+# XDG_MENU_PREFIX
+if [ -z "${XDG_MENU_PREFIX}" ] ; then
+ XDG_MENU_PREFIX="kde-"
+ export XDG_MENU_PREFIX
+fi
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- kdebase.spec 15 May 2007 15:23:04 -0000 1.249
+++ kdebase.spec 15 May 2007 19:11:53 -0000 1.250
@@ -1,9 +1,10 @@
%define rhel 0
-%define debug 0
+%define debug 0
%define final 0
%define redhatify 1
+%define kde_settings 1
%define qt_version 3.3.8
%define arts_version 1.5.6
@@ -16,14 +17,16 @@
Summary: K Desktop Environment - core files
Name: kdebase
-Version: 3.5.6
-Release: 7%{?dist}
Epoch: 6
+Version: 3.5.6
+Release: 8%{?dist}
+
+License: GPL
Url: http://www.kde.org
Group: User Interface/Desktops
-License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+
Source1: konsole.desktop
Source2: KDE.session.gnome
Source3: kde.desktop
@@ -62,25 +65,26 @@
Patch27: kdebase-3.5.6-consolekit-kdm.patch
Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
-Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
+# See http://gwenole.beauchesne.info/en/projects/nspluginwrapper/help
+Patch200: http://gwenole.beauchesne.info/projects/nspluginwrapper/files/kdebase-3.4.2-npapi-64bit-fixes.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
Requires(post): fileutils sh-utils
Requires(postun): fileutils sh-utils
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: libxml2 >= 2.6.5
-Requires: /etc/X11/xdm/Xaccess
-Requires: /etc/X11/xdm/Xservers
-Requires: /etc/X11/xdm/Xwilling
-Requires: /etc/X11/xinit/Xsession
-Requires: /etc/X11/xdm/Xsetup_0
-Requires: cdparanoia-libs
-Requires: pam >= 0.79-6
-Requires: htdig
+#Requires: /etc/X11/xdm/Xaccess
+#Requires: /etc/X11/xdm/Xservers
+#Requires: /etc/X11/xdm/Xwilling
+#Requires: /etc/X11/xinit/Xsession
+#Requires: /etc/X11/xdm/Xsetup_0
+# See http://bugzilla.redhat.com/191306
+Requires(hint): htdig
+# man2html
+Requires(hint): man
+# /sbin/fuser
Requires: psmisc
+
%ifarch %{ix86} x86_64 ia64 ppc ppc64
Requires: pm-utils
%endif
@@ -88,6 +92,18 @@
Requires: eject
%endif
+# upgrade path for former kde-redhat'ers
+Obsoletes: %{name}-kdm < %{epoch}:%{version}-%{release}
+Provides: %{name}-kdm = %{epoch}:%{version}-%{release}
+
+%if %{kde_settings}
+Requires: kde-settings
+# when/if -kdm is ever packaged separately
+Requires: kde-settings-kdm
+%else
+Requires: xorg-x11-xdm
+%endif
+
%if %{redhatify}
Requires: desktop-backgrounds-basic
Requires: redhat-menus => 6.7.5
@@ -95,19 +111,24 @@
%endif
BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: libxslt-devel libxml2-devel
+%if 0%{?fedora} > 6
BuildRequires: libsmbclient-devel
+%else
+BuildRequires: samba
+%endif
+# leave this out for now -- Rex
+#Requires(hint): samba-common
BuildRequires: pam-devel
BuildRequires: gettext
BuildRequires: imake
BuildRequires: perl
BuildRequires: sed
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: autoconf
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
BuildRequires: pkgconfig
BuildRequires: doxygen
-BuildRequires: cdparanoia
-BuildRequires: cdparanoia-devel
BuildRequires: dbus-devel >= 0.90
BuildRequires: hal-devel >= 0.5
BuildRequires: freetype-devel
@@ -136,6 +157,7 @@
%ifarch alpha %{ix86} x86_64
BuildRequires: lm_sensors-devel
%endif
+BuildRequires: OpenEXR-devel
%description
Core applications for the K Desktop Environment. Included are: kdm
@@ -149,10 +171,8 @@
%package devel
Summary: Development files for kdebase
-Requires: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
Requires: kdelibs-devel >= %{version}
Group: Development/Libraries
-
%description devel
Header files for developing applications using kdebase.
Install kdebase-devel if you want to develop or compile Konqueror,
@@ -162,7 +182,6 @@
Summary: Extras packages from kdebase
Requires: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
Group: User Interface/Desktops
-
%description extras
Extra applications for the K Desktop Environment, including:
* kappfinder
@@ -170,6 +189,7 @@
* ktip
* kpersonalizer
+
%prep
%setup -q
%patch0 -p1 -b .redhat-pam
@@ -209,16 +229,17 @@
%endif
# add missing icons for package_games_kids
-cp %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
-
-%build
-# set some default enviroments
-unset QTDIR && . /etc/profile.d/qt.sh
+install -p -m644 %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
+
+%build
+# set some default enviroments
+unset QTDIR && . /etc/profile.d/qt.sh
+
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
@@ -227,14 +248,17 @@
--with-kdm-pam=kdm \
--with-kcp-pam=kcheckpass \
--with-kss-pam=kscreensaver \
- --disable-gcc-hidden-visibility \
+ --with-libraw1394 \
+ --with-openexr \
+ --with-samba \
+ --with-sensors \
--with-xinerama \
+ --with-xscreensaver \
--without-shadow \
--disable-shadow \
--disable-rpath \
--sysconfdir=%{_sysconfdir} \
--disable-greet-lib \
- --with-cdparanoia \
%if %{arts} == 0
--without-arts \
%endif
@@ -251,28 +275,27 @@
%endif
--includedir=%{_includedir}/kde
-
make %{?_smp_mflags}
# build mail setting tool
-g++ $FLAGS -o mailsettings %{SOURCE7}
+%{__cxx} $CXXFLAGS -o mailsettings %{SOURCE7}
+
%install
rm -rf %{buildroot}
make RUN_KAPPFINDER=no DESTDIR=%{buildroot} install
-install -m 755 mailsettings %{buildroot}%{_bindir}
+install -p -m755 mailsettings %{buildroot}%{_bindir}/
# Fix up permissions on some things
chmod 755 %{buildroot}%{_bindir}/kdesud
# install pam configuration file
-mkdir -p %{buildroot}/etc/pam.d
-install -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
-install -m 644 kdm.pamd %{buildroot}/etc/pam.d/kdm
-install -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
-install -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
+install -p -D -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
+install -p -D -m 644 kdm.pamd %{buildroot}/etc/pam.d/kdm
+install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
+install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
%if %{rhel}
rm -rf %{buildroot}%{_bindir}/kappfinder \
@@ -287,8 +310,19 @@
# install gdm session support
mkdir -p %{buildroot}%{_datadir}/xsessions
-install -m 755 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
+install -p -m 755 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
+# install logrotate script
+mkdir -p %{buildroot}/etc/logrotate.d
+install -p -m 644 %{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
+
+%if ! %{kde_settings}
# install config files
pushd %{buildroot}
tar xjf %{SOURCE4}
@@ -297,10 +331,6 @@
find etc/skel/.kde -type d | xargs chmod 0755
popd
-# install logrotate script
-mkdir -p %{buildroot}/etc/logrotate.d
-install -m 644 %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
-
# Symlink things to their correct place
rm -rf %{buildroot}%{_datadir}/config/kdm
ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
@@ -314,14 +344,9 @@
ln -fs ../../X11/xinit/Xsession Xsession
popd
-# 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
-
# kde resource
-install -m 644 %{SOURCE12} %{buildroot}/etc/
+install -p -m 644 %{SOURCE12} %{buildroot}/etc/
+%endif
# Make symlinks relative
cd %{buildroot}/%{_docdir}/HTML/en
@@ -362,7 +387,7 @@
echo "OnlyShowIn=KDE;" >> $f
done
mkdir -p %{buildroot}/etc/kde/env
- install -m 755 %{SOURCE8} %{buildroot}/etc/kde/env/
+ install -p -m755 %{SOURCE8} %{buildroot}/etc/kde/env/
%endif
# Own Mozilla plugin dir
@@ -371,23 +396,21 @@
# exclude fonts.dir
rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
+
%clean
rm -rf %{buildroot}
+
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_bindir}/update-desktop-database 2> /dev/null || :
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_bindir}/update-desktop-database 2> /dev/null || :
%post extras
@@ -404,6 +427,7 @@
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
%files extras
%defattr(-,root,root)
# kappfinder
@@ -464,13 +488,15 @@
%doc %{_docdir}/HTML/en/*
%config(noreplace) /etc/ksysguarddrc
/etc/kde
-%dir /etc/skel/.kde
-/etc/skel/.kde/*
%config(noreplace) /etc/xdg/menus/*
%config(noreplace) /etc/logrotate.d/kdm
%config(noreplace) %{_datadir}/xsessions/*
+%if ! %{kde_settings}
+%dir /etc/skel/.kde
+/etc/skel/.kde/*
%config(noreplace) /etc/kderc
%config(noreplace) /etc/X11/xdm/kdmrc
+%endif
%config(noreplace) /etc/pam.d/*
%dir %{_libdir}/mozilla
%dir %{_libdir}/mozilla/plugins
@@ -562,7 +588,7 @@
%{_libdir}/kde3/*
%{_libdir}/kconf_update_bin
%{_datadir}/applications/*
-%{_datadir}/applnk
+%{_datadir}/applnk/
%{_datadir}/apps/*
%{_datadir}/autostart/*
%config(noreplace) %{_datadir}/config/*
@@ -582,10 +608,10 @@
%{_datadir}/mimelnk/print
%{_datadir}/services/*
%{_datadir}/servicetypes/*
-%{_datadir}/sounds
-%{_datadir}/templates
-%{_datadir}/wallpapers
-%{_datadir}/apps/kdm/faces
+%{_datadir}/sounds/
+%{_datadir}/templates/
+%{_datadir}/wallpapers/
+%{_datadir}/apps/kdm/faces/
%files devel
%defattr(-,root,root)
@@ -601,7 +627,16 @@
%{_libdir}/*.so
%exclude %{_libdir}/libkdeinit_*.so
+
%changelog
+* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-8
+- cleanup/simplify scriptlets
+- drop Req/Prov's that include %%_arch (they don't work)
+- Req: +samba-common
+- BR: +OpenEXR-devel, -cdparanoia
+- env.sh: use XDG_MENU_PREFIX
+- npapi-64bit-fixes.patch
+
* Tue May 15 2007 Than Ngo <than at redhat.com> - 6:3.5.6-7.fc7
- enable userlist by default in KDM, bz#239701
- own %%{_datadir}/apps/kdm/faces, bz#239694
More information about the fedora-extras-commits
mailing list