rpms/kdeadmin/F-11 .cvsignore, 1.67, 1.68 kdeadmin.spec, 1.140, 1.141 sources, 1.69, 1.70
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Feb 10 13:54:47 UTC 2010
Author: ltinkl
Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6285/F-11
Modified Files:
.cvsignore kdeadmin.spec sources
Log Message:
KDE 4.4.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore 26 Jan 2010 13:07:12 -0000 1.67
+++ .cvsignore 10 Feb 2010 13:54:47 -0000 1.68
@@ -1 +1 @@
-kdeadmin-4.3.5.tar.bz2
+kdeadmin-4.4.0.tar.bz2
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- kdeadmin.spec 26 Jan 2010 13:07:12 -0000 1.140
+++ kdeadmin.spec 10 Feb 2010 13:54:47 -0000 1.141
@@ -1,12 +1,12 @@
+
%if 0%{?fedora}
%define system_config_printer_kde 1
-%define include_kpackage 1
%endif
Name: kdeadmin
-Summary: K Desktop Environment - Administrative tools
+Summary: KDE Administrative tools
Epoch: 7
-Version: 4.3.5
+Version: 4.4.0
Release: 1%{?dist}
Group: User Interface/Desktops
@@ -15,9 +15,6 @@ URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source1: kuser.pam
-Source2: kuser.pamd
-
# FIXME/TODO: upstream this -- Rex
Patch0: kdeadmin-4.2.85-printing.patch
@@ -30,6 +27,9 @@ BuildRequires: python-devel
Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
+Obsoletes: kdeadmin-kpackage < %{epoch}:%{version}-%{release}
+
+
%if ! 0%{?system_config_printer_kde}
Obsoletes: system-config-printer-kde < %{epoch}:%{version}-%{release}
%endif
@@ -41,16 +41,6 @@ The %{name} package includes administrat
* ksystemlog: system log viewer
* kuser: user manager
-%package kpackage
-Summary: An RPM package manager
-Group: Applications/System
-Requires: smart
-%description kpackage
-Kpackage is an RPM package manager, used for displaying currently installed
-packages, uninstalling them and installing new ones.
-
-It is based upon the "Smart Package Manager".
-
%package -n system-config-printer-kde
Summary: A printer administration tool for KDE
Group: System Environment/Base
@@ -62,22 +52,18 @@ a CUPS print server.
%prep
-%setup -q
+%setup -q -n kdeadmin-%{version}
%patch0 -p1 -b .printing
# upstream patches
+
%build
%if ! 0%{?system_config_printer_kde}
sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
%endif
-%if ! 0%{?include_kpackage}
-sed -i -e 's:macro_optional_add_subdirectory(kpackage):#macro_optional_add_subdirectory(kpackage):g' CMakeLists.txt
-sed -i -e 's:add_subdirectory(kpackage):#add_subdirectory(kpackage):g' doc/CMakeLists.txt
-%endif
-
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
@@ -111,19 +97,6 @@ touch --no-create %{_kde4_iconsdir}/hico
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
fi
-%if 0%{?include_kpackage}
-%post kpackage
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans kpackage
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%postun kpackage
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-fi
-%endif
%files
%defattr(-,root,root,-)
@@ -148,17 +121,6 @@ fi
%{_kde4_libdir}/kde4/kcm_cron.so
%{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
-%if 0%{?include_kpackage}
-%files kpackage
-%defattr(-,root,root,-)
-%{_kde4_bindir}/kpackage
-%{_kde4_appsdir}/kpackage/
-%{_kde4_datadir}/applications/kde4/kpackage.desktop
-%{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
-%{_kde4_docdir}/HTML/en/kpackage/
-%{_kde4_iconsdir}/hicolor/*/*/kpackage*
-%endif
-
%if 0%{?system_config_printer_kde}
%files -n system-config-printer-kde
%defattr(-,root,root,-)
@@ -168,14 +130,34 @@ fi
%changelog
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
-- 4.3.5
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 7:4.4.0-1
+- 4.4.0
-* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.90 (4.4rc1)
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- Repositioning the KDE Brand (#547361)
+- omit kpackage
+- drop old/unused kuser consolehelper files
+
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
- fix rhel conditionals
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Tue Dec 1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
+* Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
- 4.3.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources 26 Jan 2010 13:07:12 -0000 1.69
+++ sources 10 Feb 2010 13:54:47 -0000 1.70
@@ -1 +1 @@
-082537af4bd47ea9006ff4fd4e9bd7af kdeadmin-4.3.5.tar.bz2
+a5fb36416b210e825db011c66a5695d3 kdeadmin-4.4.0.tar.bz2
More information about the scm-commits
mailing list