rpms/kdebase/devel kde4-opt.sh, NONE, 1.1.2.1 kde4-xdg_menu_prefix.sh, NONE, 1.1.2.1 .cvsignore, 1.57.2.1, 1.57.2.2 branch, 1.1.2.1, 1.1.2.2 kdebase.spec, 1.263.2.1, 1.263.2.2 kde-env.sh, 1.1.2.1, NONE kde.desktop, 1.2.6.2, NONE

Tue Jul 24 23:33:10 UTC 2007

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5451

Modified Files:
      Tag: kdebase-kde4-branch
	.cvsignore branch kdebase.spec 
Added Files:
      Tag: kdebase-kde4-branch
	kde4-opt.sh kde4-xdg_menu_prefix.sh 
Removed Files:
      Tag: kdebase-kde4-branch
	kde-env.sh kde.desktop 
Log Message:
sync w/kde-redhat pkg updates

--- NEW FILE kde4-opt.sh ---
## 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=@@SYSCONFDIR@@/xdg:${XDG_CONFIG_DIRS}
#   export XDG_CONFIG_DIRS
#fi

#LD_LIBRARY_PATH=@@LIBDIR@@
#KDEDIRS=@@PREFIX@@
#PATH=@@BINDIR@@/:$PATH
#KDEHOME=~/.kde4



--- NEW FILE kde4-xdg_menu_prefix.sh ---
## 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=@@SYSCONFDIR@@/xdg:${XDG_CONFIG_DIRS}
#   export XDG_CONFIG_DIRS
#fi

## XDG_MENU_PREFIX
if [ -z "${XDG_MENU_PREFIX}" ] ; then
   XDG_MENU_PREFIX="kde4-"
   export XDG_MENU_PREFIX
fi

#LD_LIBRARY_PATH=@@LIBDIR@@
#KDEDIRS=@@PREFIX@@
#PATH=@@BINDIR@@/:$PATH
#KDEHOME=~/.kde4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -u -r1.57.2.1 -r1.57.2.2
--- .cvsignore	24 Jul 2007 14:29:00 -0000	1.57.2.1
+++ .cvsignore	24 Jul 2007 23:32:37 -0000	1.57.2.2
@@ -1,34 +1 @@
-kde-redhat-config-3.2.0-0.2.tar.bz2
-kdebase-3.3.0.tar.bz2
-kde-redhat-config-3.2.0-0.3.tar.bz2
-kdebase-3.3.1.tar.bz2
-kde-redhat-config-3.2.0-0.4.tar.bz2
-kde-redhat-config-3.2.0-0.5.tar.bz2
-kde-redhat-config-3.2.0-0.6.tar.bz2
-kdebase-3.3.2.tar.bz2
-kdebase-3.4.0-rc1.tar.bz2
-kde-redhat-config-3.2.0-0.7.tar.bz2
-kdebase-3.4.0.tar.bz2
-kde-redhat-config-3.2.0-0.8.tar.bz2
-kde-redhat-config-3.2.0-0.9.tar.bz2
-kdebase-3.4.1.tar.bz2
-kdebase-3.4.2.tar.bz2
-kde-redhat-config-3.4.2-fc4-0.1.tar.bz2
-kde-redhat-config-3.4.2-fc4-0.2.tar.bz2
-kdebase-3.4.91.tar.bz2
-kdebase-3.4.92.tar.bz2
-kdebase-3.5.0.tar.bz2
-kde-redhat-config-3.5-fc5-0.1.tar.bz2
-kdebase-3.5.1.tar.bz2
-kde-redhat-config-3.5-fc5-0.2.tar.bz2
-kdebase-3.5.2.tar.bz2
-kdebase-3.5.3.tar.bz2
-kde-redhat-config-3.5-fc5-0.3.tar.bz2
-kdebase-3.5.4.tar.bz2
-kde-redhat-config-3.5-fc5-0.4.tar.bz2
-kde-redhat-config-3.5-fc5-0.5.tar.bz2
-kdebase-3.5.6.tar.bz2
-kde-redhat-config-3.5-fc5-0.6.tar.bz2
-kde-redhat-config-3.5-fc7-1.tar.bz2
-kdebase-3.5.7.tar.bz2
 kdebase-3.91.0.tar.bz2


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/Attic/branch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- branch	24 Jul 2007 14:32:33 -0000	1.1.2.1
+++ branch	24 Jul 2007 23:32:37 -0000	1.1.2.2
@@ -1 +1 @@
-kde4
+devel


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.1
retrieving revision 1.263.2.2
diff -u -r1.263.2.1 -r1.263.2.2
--- kdebase.spec	24 Jul 2007 14:29:00 -0000	1.263.2.1
+++ kdebase.spec	24 Jul 2007 23:32:37 -0000	1.263.2.2
@@ -1,16 +1,19 @@
+
+
+%if 0%{?fedora} > 7
 Name:          kdebase
+Epoch:         6
 
-%if "%{name}" != "kdebase4"
 Obsoletes:     kdebase4 < %{version}-%{release}
 Provides:      kdebase4 = %{version}-%{release}
+
 %else
+Name:          kdebase4
 %define        _prefix /opt/kde4
 %endif
 
-Epoch:         6
-
 Version:       3.91.0
-Release:       3%{?dist}%{?kde}
+Release:       5%{?dist}%{?kde}
 Summary:       K Desktop Environment 4 - Core Files
 
 License:       GPL
@@ -19,10 +22,10 @@
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1:       kde.desktop
 # FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
 # don't rely on env (same goes for kde3) -- Rex
-Source2:       kde-env.sh
+Source1: kde4-opt.sh
+Source2: kde4-xdg_menu_prefix.sh
 
 %if "%{_prefix}" != "/usr"
 # macros sensitive to _prefix mods
@@ -30,18 +33,17 @@
 %define        _sysconfdir %{_prefix}/etc
 %endif
 
-
 # use ~/.kde4 instead of ~/.kde
 Patch0:        kdebase-%{version}-kde4home.diff
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 
-BuildRequires: cmake >= 2.4.5
-BuildRequires: kdelibs-devel >= %{version}
+BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 
-Requires: kdelibs >= %{version}
+Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
 BuildRequires: xorg-x11-proto-devel libXcomposite-devel libXdamage-devel
@@ -80,13 +82,13 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Header files for kdebase 4
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:  Header files for kdebase4
+Requires: %{name} = %{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
-Requires: kdelibs-devel kdepimlibs-devel
+Requires: kdelibs4-devel kdepimlibs4-devel
 # FIXME/TODO: trim these down -- Rex
 Requires: xorg-x11-proto-devel libXcomposite-devel libXdamage-devel
 Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
@@ -99,7 +101,6 @@
 Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
 Requires: dbus-devel hal-devel NetworkManager-devel bluez-libs-devel
 Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
-
 %description devel
 Header files for developing applications using kdebase4.
 WARNING: This is an alpha version. It probably has many bugs left.
@@ -136,7 +137,30 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -D -m644 -p %{SOURCE1} %{buildroot}/usr/share/xsessions/kde.desktop
+## ENV/SHUTDOWN
+# until startkde is patched to search/use %{_sysconfdir}/kde/{env,shutdown}
+install -d %{buildroot}%{_prefix}/{env,shutdown}
+install -D -m644 -p %{SOURCE1} %{buildroot}%{_prefix}/env/
+%if "%{_prefix}" == "/usr"
+install -D -m644 -p %{SOURCE2} %{buildroot}%{_prefix}/env/
+%endif
+sed -i \
+  -e "s|@@PREFIX@@|%{_prefix}|" \
+  -e "s|@@BINDIR@@|%{_bindir}|" \
+  -e "s|@@LIBDIR@@|%{_libdir}|" \
+  -e "s|@@SYSCONFDIR@@|%_sysconfdir}|" \
+  %{buildroot}%{_prefix}/env/*.sh
+
+mkdir -p %{buildroot}/usr/share/xsessions
+## kde->kde4 xsession
+%if "%{name}" != "kdebase"
+mv %{buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop \
+   %{buildroot}%{_datadir}/apps/kdm/sessions/kde4.desktop
+sed -i -e "s|^Name=KDE$|Name=KDE4|" %{buildroot}%{_datadir}/apps/kdm/sessions/kde4.desktop
+ln -s %{_datadir}/apps/kdm/sessions/kde4.desktop %{buildroot}/usr/share/xsessions/kde4.desktop
+%else
+ln -s %{_datadir}/apps/kdm/sessions/kde.desktop  %{buildroot}/usr/share/xsessions/kde.desktop
+%endif
 
 
 %clean
@@ -163,8 +187,12 @@
 %if "%{_prefix}" != "/usr"
 %dir %{_datadir}/desktop-directories
 %dir %{_libdir}/kconf_update_bin
+%dir %{_prefix}/env
+%dir %{_prefix}/shutdown
 %endif
-/usr/share/xsessions/kde.desktop
+/usr/share/xsessions/*.desktop
+%{_prefix}/env/*
+#{_prefix}/shutdown/*
 %{_bindir}/*
 %{_datadir}/applications/kde4/*
 %{_datadir}/apps/*
@@ -175,7 +203,7 @@
 %{_datadir}/dbus-1/services/*
 %{_datadir}/desktop-directories/*
 %{_datadir}/icons/crystalsvg/
-%{_datadir}/icons/hicolor/
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/oxygen/
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
@@ -201,8 +229,12 @@
 
 
 %changelog
-* Thu Jul 05 2007 Than Ngo <than at redhat.com> 3.91.0-4
-- rename to kdebase
+* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
+- kde4.desktop: fix session Name
+
+* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-4
+- cleanup/fix kde4.desktop
+- kdepimlibs4->kdepimlibs
 
 * Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
 - fix %%_sysconfdir for %%_prefix != /usr case.


--- kde-env.sh DELETED ---


--- kde.desktop DELETED ---


