diff --git a/.cvsignore b/.cvsignore index 298835d..65f168b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -kdeutils-3.5.7.tar.bz2 -kdeutils-3.5.8.tar.bz2 +kdeutils-3.5.9.tar.bz2 diff --git a/kdeutils-3.5.7-glibc-open.patch b/kdeutils-3.5.7-glibc-open.patch deleted file mode 100644 index 50bff1b..0000000 --- a/kdeutils-3.5.7-glibc-open.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdeutils-3.5.7/ark/compressedfile.cpp.orig kdeutils-3.5.7/ark/compressedfile.cpp ---- kdeutils-3.5.7/ark/compressedfile.cpp.orig 2007-09-27 16:17:26.000000000 +0200 -+++ kdeutils-3.5.7/ark/compressedfile.cpp 2007-09-27 16:42:08.000000000 +0200 -@@ -365,7 +365,7 @@ void CompressedFile::remove(QStringList - // does a reload and finds it no longer exists! - QFile::remove(m_filename); - -- ::close(::open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL)); -+ ::close(KDE_open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL, 0666)); - - m_tmpfile = ""; - emit sigDelete(true); diff --git a/kdeutils-3.5.7-klaptopdaemon_libXss.patch b/kdeutils-3.5.7-klaptopdaemon_libXss.patch deleted file mode 100644 index 2c1b5af..0000000 --- a/kdeutils-3.5.7-klaptopdaemon_libXss.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kdeutils-3.5.7/klaptopdaemon/Makefile.am.libXss 2007-05-14 02:40:45.000000000 -0500 -+++ kdeutils-3.5.7/klaptopdaemon/Makefile.am 2007-07-26 10:24:51.000000000 -0500 -@@ -9,8 +9,8 @@ libkcmlaptop_la_LIBADD = $(LIB_KDEUI) - - MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c - kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel --kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst --kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la -+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) $(LIB_XSS) -lXtst libkcmlaptop.la - - klaptop_acpi_helper_SOURCES = acpi_helper.cpp - diff --git a/kdeutils.spec b/kdeutils.spec index 8fbda2d..dc8ee82 100644 --- a/kdeutils.spec +++ b/kdeutils.spec @@ -1,10 +1,8 @@ # Fedora review: http://bugzilla.redhat.com/194375 -%define debug 0 -%define final 1 +#define debug 1 %define make_cvs 1 -%define arts 1 %if 0%{?fedora} > 7 # include -devel subpkg or not? 1=yes @@ -12,16 +10,11 @@ %define devel 1 %endif -# include kalc in main pkg? -%define kcalc_in_main 1 - -%define appdir %{_datadir}/applications/kde - Name: kdeutils Summary: K Desktop Environment - Utilities Epoch: 6 -Version: 3.5.8 -Release: 2%{?dist} +Version: 3.5.9 +Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -36,7 +29,6 @@ Source3: kcmlaptoprc Patch1: kdf-3.0.2-label.patch Patch2: kdeutils-3.5.4-bz#205553.patch Patch3: kdeutils-3.5.4-suspend.patch -Patch5: kdeutils-3.5.7-glibc-open.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -59,26 +51,26 @@ Obsoletes: superkaramba < 0:%{superkaramba_ver} Provides: superkaramba = 0:%{superkaramba_ver} %if ! 0%{?devel} +# helps multilib upgrades +Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release} %endif %description -Utilities for the K Desktop Environment. -Includes: - * ark (tar/gzip archive manager); -%if %{kcalc_in_main} - * kcalc (scientific calculator); -%endif - * kcharselect (character selector); - * kdepasswd (change password); - * kdessh (ssh front end); - * kdf (view disk usage); - * kedit (simple text editor); - * kfloppy (floppy formatting tool); +Utilities for the K Desktop Environment, including: + * ark (tar/gzip archive manager) + * kcalc (scientific calculator) + * kcharselect (character selector) + * kdepasswd (change password) + * kdessh (ssh front end) + * kdf (view disk usage) + * kedit (simple text editor) + * kfloppy (floppy formatting tool) * kgpg (gpg gui) - * khexedit (hex editor); - * kjots (note taker); - * ktimer (task scheduler); + * khexedit (hex editor) + * kjots (note taker) + * kregexpeditor (regular expression editor) + * ktimer (task scheduler) * kwikdisk (removable media utility) %if 0%{?devel} @@ -97,12 +89,12 @@ Development files for %{name}. Summary: Extras packages from %{name} Group: Applications/Internet Requires: %{name} = %{epoch}:%{version}-%{release} +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 +Requires: pm-utils +%endif Requires: usermode %description extras More Utilities for the K Desktop Environment: -%if ! %{kcalc_in_main} - * kcalc (scientific calculator); -%endif * kmilo * ksim (system information monitor); * klaptopdaemon (battery monitoring and management for laptops); @@ -114,7 +106,6 @@ More Utilities for the K Desktop Environment: %patch1 -p1 -b .label %patch2 -p1 -b .bz#205553 %patch3 -p1 -b .suspend -%patch5 -p1 -b .glibc-open %if %{make_cvs} make -f admin/Makefile.common cvs @@ -128,16 +119,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh --enable-new-ldflags \ --disable-dependency-tracking \ --disable-rpath \ -%if %{debug} == 0 - --disable-debug \ - --disable-warnings \ -%endif -%if %{final} + %{!?debug:--disable-debug --disable-warnings} \ --enable-final \ -%endif -%if %{arts} == 0 - --without-arts \ -%endif --includedir=%{_includedir}/kde \ --with-snmp \ --with-xscreensaver @@ -152,11 +135,11 @@ make install DESTDIR=%{buildroot} # Show only in KDE (really? -- Rex) for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \ - KCharSelect ark kwalletmanager kwalletconfig \ - irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do - if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then - echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop - fi + KCharSelect ark kwalletmanager kwalletconfig \ + irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do + if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then + echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop + fi done ## File lists @@ -242,20 +225,6 @@ done %files extras %defattr(-,root,root,-) -%if ! %{kcalc_in_main} -# kcalc -%{_docdir}/HTML/*/kcalc/ -%{_bindir}/kcalc -%{_libdir}/kde3/kcalc.* -%{_libdir}/libkdeinit_kcalc.la -%{_libdir}/libkdeinit_kcalc.so -%{_datadir}/applications/kde/kcalc.desktop -%{_datadir}/apps/kcalc -%{_datadir}/config.kcfg/kcalc.kcfg -%{_datadir}/icons/hicolor/??x??/apps/kcalc.png -%{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz -%endif - # kmilo %{_libdir}/kde3/kded_kmilod.* %{_libdir}/kde3/kmilo* @@ -297,20 +266,6 @@ done %files -f %{name}.lang %defattr(-,root,root,-) -%if ! %{kcalc_in_main} -# kcalc -%exclude %{_docdir}/HTML/*/kcalc/ -%exclude %{_bindir}/kcalc -%exclude %{_libdir}/kde3/kcalc.* -%exclude %{_libdir}/libkdeinit_kcalc.la -%exclude %{_libdir}/libkdeinit_kcalc.so -%exclude %{_datadir}/applications/kde/kcalc.desktop -%exclude %{_datadir}/apps/kcalc -%exclude %{_datadir}/config.kcfg/kcalc.kcfg -%exclude %{_datadir}/icons/hicolor/??x??/apps/kcalc.png -%exclude %{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz -%endif - # kmilo %exclude %{_libdir}/kde3/kded_kmilod.* %exclude %{_libdir}/kde3/kmilo* @@ -381,6 +336,18 @@ done %changelog +* Fri Feb 15 2008 Rex Dieter - 6:3.5.9-1 +- kde-3.5.9 + +* Mon Nov 26 2007 Rex Dieter - 6:3.5.8-5 +- -extras: Requires: pm-utils (used by klaptopdaemon) + +* Mon Nov 26 2007 Rex Dieter - 6:3.5.8-4 +- include kregexpeditor in %%description (#399281) + +* Tue Oct 25 2007 Rex Dieter - 6:3.5.8-3 +- Obsoletes: %%name ... to help out multilib upgrades + * Sat Oct 13 2007 Rex Dieter - 6:3.5.8-2 - kde-3.5.8 - omit -devel subpkg (f8+) diff --git a/sources b/sources index 7ec8658..0bfd2a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1a0fcc83f35428a76cf7523a04ba19c kdeutils-3.5.8.tar.bz2 +dbe5ddff57141f27778601df5571e182 kdeutils-3.5.9.tar.bz2