From d5341ab22a60eb175716294444a1bfb71908387b Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 12:51:37 +0000 Subject: auto-import changelog data from switchdesk-3.9.8-18.src.rpm Thu Jun 26 2003 Than Ngo 3.9.8-18 - build with gcc-3.3-12 - fix desktop file issue - cleanup specfile - disable debuginfo Wed Jun 04 2003 Elliot Lee - rebuilt --- diff --git a/switchdesk.spec b/switchdesk.spec index 381c08c..9d97da2 100644 --- a/switchdesk.spec +++ b/switchdesk.spec @@ -1,12 +1,11 @@ +%define debug_package %{nil} %define desktop_file 1 -%if %{desktop_file} %define desktop_file_utils_version 0.2.93 -%endif Name: switchdesk Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel. Version: 3.9.8 -Release: 15 +Release: 18 Patch0: switchdesk-3.9.8-po-update.patch Source: %{name}-%{version}.tar.bz2 License: GPL @@ -34,7 +33,7 @@ environments. %package kde Group: User Interface/Desktops Summary: A KDE interface for the Desktop Switcher. -BuildPrereq: qt-devel >= 2 +BuildPrereq: qt-devel %description kde The switchdesk-kde package provides the Desktop Switcher with a KDE @@ -49,7 +48,6 @@ The switchdesk-gnome package provides a GNOME look and feel for the Desktop Switcher program provided in the switchdesk package. %prep -rm -rf $RPM_BUILD_ROOT %setup -q %patch0 -p1 -b .po-update @@ -59,26 +57,23 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh export KDEDIR=%{_prefix} LANG=C make -f Makefile.cvs -#export CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" -# Removed this and replaced with %%configure below. Remove this cruft in future -#./configure --prefix=/usr --mandir=%{_mandir} --libdir=%{_libdir} --disable-path-check %configure --disable-path-check make %install rm -fr $RPM_BUILD_ROOT -export KDEDIR=%{_prefix} -#make install DESTDIR="$RPM_BUILD_ROOT" localedir=%{buildroot}%{_datadir}/locale %makeinstall RHSYSTEMDIR="$RPM_BUILD_ROOT/etc/X11/applnk/System" %if %{desktop_file} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor redhat \ +desktop-file-install \ + --vendor redhat \ + --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category "Application;Settings;X-Red-Hat-Extra" \ $RPM_BUILD_ROOT/etc/X11/applnk/System/switchdesk.desktop -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-switchdesk.desktop %endif + %find_lang %{name} %clean @@ -89,9 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/switchdesk %{_bindir}/switchdesk-helper %if %{desktop_file} -/etc/X11/applnk/System/switchdesk.desktop -%else %{_datadir}/applications/* +%else +/etc/X11/applnk/System/switchdesk.desktop %endif %{_datadir}/apps/switchdesk %{_mandir}/man1/switchdesk.1* @@ -105,6 +100,15 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/switchdesk-gnome %changelog +* Thu Jun 26 2003 Than Ngo 3.9.8-18 +- build with gcc-3.3-12 +- fix desktop file issue +- cleanup specfile +- disable debuginfo + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + * Wed Jan 22 2003 Mike A. Harris 3.9.8-15 - Remove multiple .desktop files (#72872)