rpms/kdeutils/F-7 .cvsignore, 1.36, 1.37 kdeutils.spec, 1.92, 1.93 sources, 1.39, 1.40 kdeutils-3.5.7-glibc-open.patch, 1.1, NONE kdeutils-3.5.7-klaptopdaemon_libXss.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sat Feb 16 03:58:27 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdeutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29180
Modified Files:
.cvsignore kdeutils.spec sources
Removed Files:
kdeutils-3.5.7-glibc-open.patch
kdeutils-3.5.7-klaptopdaemon_libXss.patch
Log Message:
* Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-1
- kde-3.5.9
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 25 Oct 2007 10:25:45 -0000 1.36
+++ .cvsignore 16 Feb 2008 03:57:52 -0000 1.37
@@ -1,2 +1 @@
-kdeutils-3.5.7.tar.bz2
-kdeutils-3.5.8.tar.bz2
+kdeutils-3.5.9.tar.bz2
Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-7/kdeutils.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kdeutils.spec 25 Oct 2007 10:25:45 -0000 1.92
+++ kdeutils.spec 16 Feb 2008 03:57:52 -0000 1.93
@@ -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 @@
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 @@
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 @@
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 @@
%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 @@
--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 @@
# 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 @@
%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 @@
%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 @@
%changelog
+* Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-1
+- kde-3.5.9
+
+* Mon Nov 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5
+- -extras: Requires: pm-utils (used by klaptopdaemon)
+
+* Mon Nov 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
+- include kregexpeditor in %%description (#399281)
+
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3
+- Obsoletes: %%name ... to help out multilib upgrades
+
* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-2
- kde-3.5.8
- omit -devel subpkg (f8+)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-7/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 25 Oct 2007 10:25:45 -0000 1.39
+++ sources 16 Feb 2008 03:57:52 -0000 1.40
@@ -1 +1 @@
-d1a0fcc83f35428a76cf7523a04ba19c kdeutils-3.5.8.tar.bz2
+dbe5ddff57141f27778601df5571e182 kdeutils-3.5.9.tar.bz2
--- kdeutils-3.5.7-glibc-open.patch DELETED ---
--- kdeutils-3.5.7-klaptopdaemon_libXss.patch DELETED ---
More information about the fedora-extras-commits
mailing list