rpms/kdeutils/F-7 kdeutils-3.5.7-glibc-open.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 kdeutils.spec, 1.91, 1.92 sources, 1.38, 1.39
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Oct 25 10:26:17 UTC 2007
- Previous message (by thread): rpms/kdeutils/devel kdeutils.spec,1.98,1.99
- Next message (by thread): rpms/kdevelop/devel kdevelop-3.5.0-autosave.patch, NONE, 1.1 kdevelop-3.5.0-svn.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 kdevelop.spec, 1.60, 1.61 sources, 1.34, 1.35 kdevelop-3.4.1-svn.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdeutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22238
Modified Files:
.cvsignore kdeutils.spec sources
Added Files:
kdeutils-3.5.7-glibc-open.patch
Log Message:
sync w/devel, kde-3.5.8
kdeutils-3.5.7-glibc-open.patch:
--- NEW FILE kdeutils-3.5.7-glibc-open.patch ---
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);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-7/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 11 Jun 2007 19:29:56 -0000 1.35
+++ .cvsignore 25 Oct 2007 10:25:45 -0000 1.36
@@ -1 +1,2 @@
kdeutils-3.5.7.tar.bz2
+kdeutils-3.5.8.tar.bz2
Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-7/kdeutils.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- kdeutils.spec 26 Jul 2007 15:50:05 -0000 1.91
+++ kdeutils.spec 25 Oct 2007 10:25:45 -0000 1.92
@@ -2,22 +2,28 @@
# Fedora review: http://bugzilla.redhat.com/194375
%define debug 0
-%define final 0
+%define final 1
%define make_cvs 1
%define arts 1
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
+%if 0%{?fedora} > 7
+# include -devel subpkg or not? 1=yes
+%else
+%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.7
+Version: 3.5.8
Release: 2%{?dist}
-License: GPL
+License: GPLv2
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Url: http://www.kde.org
@@ -30,14 +36,15 @@
Patch1: kdf-3.0.2-label.patch
Patch2: kdeutils-3.5.4-bz#205553.patch
Patch3: kdeutils-3.5.4-suspend.patch
-Patch4: kdeutils-3.5.7-klaptopdaemon_libXss.patch
+Patch5: kdeutils-3.5.7-glibc-open.patch
-Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
+%if %{make_cvs}
BuildRequires: automake libtool
+%endif
BuildRequires: gettext
BuildRequires: net-snmp-devel
BuildRequires: python-devel
@@ -51,10 +58,17 @@
Obsoletes: superkaramba < 0:%{superkaramba_ver}
Provides: superkaramba = 0:%{superkaramba_ver}
+%if ! 0%{?devel}
+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);
@@ -67,24 +81,28 @@
* ktimer (task scheduler);
* kwikdisk (removable media utility)
+%if 0%{?devel}
+# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
%package devel
-Summary: Development files for kdeutils
+Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-extras = %{epoch}:%{version}-%{release}
-Requires: kdebase-devel
+Requires: kdelibs3-devel
%description devel
-Development files for kdeutils. Install kdeutils-devel if you wish
-to develop or compile KDE utils applications.
+Development files for %{name}.
+%endif
%package extras
-Summary: Extras packages from KDEnetwork
+Summary: Extras packages from %{name}
Group: Applications/Internet
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: usermode
%description extras
More Utilities for the K Desktop Environment:
- * kcalc (scientific calculator);
+%if ! %{kcalc_in_main}
+ * kcalc (scientific calculator);
+%endif
* kmilo
* ksim (system information monitor);
* klaptopdaemon (battery monitoring and management for laptops);
@@ -96,7 +114,7 @@
%patch1 -p1 -b .label
%patch2 -p1 -b .bz#205553
%patch3 -p1 -b .suspend
-%patch4 -p1 -b .libXss
+%patch5 -p1 -b .glibc-open
%if %{make_cvs}
make -f admin/Makefile.common cvs
@@ -132,7 +150,7 @@
make install DESTDIR=%{buildroot}
-# Show only in KDE
+# 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
@@ -179,6 +197,12 @@
# klaptop setting
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
+# unpackaged files
+%if ! 0%{?devel}
+rm -rf %{buildroot}%{_includedir}/kde/
+rm -f %{buildroot}%{_libdir}/lib{kcmlaptop,khexeditcommon,kmilo,kregexpeditorcommon,ksimcore}.so
+%endif
+
%clean
rm -rf %{buildroot}
@@ -218,17 +242,19 @@
%files extras
%defattr(-,root,root,-)
+%if ! %{kcalc_in_main}
# kcalc
-%doc %{_docdir}/HTML/??/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
-%config %{_datadir}/config.kcfg/kcalc.kcfg
+%{_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.*
@@ -240,7 +266,7 @@
%{_datadir}/servicetypes/kmilo
# ksim
-%doc %{_docdir}/HTML/??/ksim/
+%{_docdir}/HTML/*/ksim/
%{_libdir}/kde3/ksim*
%{_libdir}/libksimcore.la
%{_libdir}/libksimcore.so.*
@@ -251,7 +277,7 @@
%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
# klaptop
-%doc %{_docdir}/HTML/en/kcontrol
+%{_docdir}/HTML/en/kcontrol
%{_sysconfdir}/pam.d/klaptop_acpi_helper
%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
%{_bindir}/klaptop*
@@ -269,9 +295,11 @@
%files -f %{name}.lang
+%defattr(-,root,root,-)
+%if ! %{kcalc_in_main}
# kcalc
-%exclude %{_docdir}/HTML/??/kcalc/
+%exclude %{_docdir}/HTML/*/kcalc/
%exclude %{_bindir}/kcalc
%exclude %{_libdir}/kde3/kcalc.*
%exclude %{_libdir}/libkdeinit_kcalc.la
@@ -281,6 +309,7 @@
%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.*
@@ -292,7 +321,7 @@
%exclude %{_datadir}/servicetypes/kmilo
# ksim
-%exclude %{_docdir}/HTML/??/ksim/
+%exclude %{_docdir}/HTML/*/ksim/
%exclude %{_libdir}/kde3/ksim*
%exclude %{_libdir}/libksimcore.la
%exclude %{_libdir}/libksimcore.so.*
@@ -319,8 +348,7 @@
%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-%defattr(-,root,root)
-%doc %{_docdir}/HTML/en/*
+%{_docdir}/HTML/en/*
%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
%attr(644,root,root) %{_sysconfdir}/pam.d/*
%{_bindir}/*
@@ -340,14 +368,36 @@
%{_datadir}/mimelnk/application/*
%{_datadir}/autostart/*
+%if 0%{?devel}
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kde/*
-%{_libdir}/*.so
-%exclude %{_libdir}/libkdeinit*.so
+%{_libdir}/libkcmlaptop.so
+%{_libdir}/libkhexeditcommon.so
+%{_libdir}/libkmilo.so
+%{_libdir}/libkregexpeditorcommon.so
+%{_libdir}/libksimcore.so
+%endif
%changelog
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-2
+- kde-3.5.8
+- omit -devel subpkg (f8+)
+
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> - 3.5.7-6
+- fix build issue with new current glibc-2.6.90
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
+- move kcalc back to main pkg
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
+- License: GPLv2
+- cleanups
+
+* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
+- drop Requires: kdebase
+
* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.6.7-2
- fix undefined symbols in %%_libdir/kde3/kded_klaptopdaemon.so
- BR: libXScrnSaver-devel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-7/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 11 Jun 2007 19:29:56 -0000 1.38
+++ sources 25 Oct 2007 10:25:45 -0000 1.39
@@ -1 +1 @@
-5f167f53bdbf0b8c71c2d0f0ff7593fd kdeutils-3.5.7.tar.bz2
+d1a0fcc83f35428a76cf7523a04ba19c kdeutils-3.5.8.tar.bz2
- Previous message (by thread): rpms/kdeutils/devel kdeutils.spec,1.98,1.99
- Next message (by thread): rpms/kdevelop/devel kdevelop-3.5.0-autosave.patch, NONE, 1.1 kdevelop-3.5.0-svn.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 kdevelop.spec, 1.60, 1.61 sources, 1.34, 1.35 kdevelop-3.4.1-svn.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list