packages: kde4-kdeadmin/kde4-kdeadmin.spec - 4.4.1 try #1 - no kcmlilo (?), ...

[shadzik]

Author: shadzik                      Date: Sat Feb 27 12:08:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 4.4.1 try #1
- no kcmlilo (?), main package obsoletes it

---- Files affected:
packages/kde4-kdeadmin:
   kde4-kdeadmin.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/kde4-kdeadmin/kde4-kdeadmin.spec
diff -u packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.66 packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.67
--- packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.66	Thu Feb 18 17:48:58 2010
+++ packages/kde4-kdeadmin/kde4-kdeadmin.spec	Sat Feb 27 13:08:14 2010
@@ -3,7 +3,7 @@
 #   %{_pkgconfigdir}/system-tools-backends.pc
 %define		_state		stable
 %define		orgname		kdeadmin
-%define		qtver		4.6.1
+%define		qtver		4.6.2
 
 %include	/usr/lib/rpm/macros.perl
 
@@ -14,12 +14,12 @@
 Summary(pt_BR.UTF-8):	K Desktop Environment - ferramentas administrativas
 Summary(zh_CN.UTF-8):	KDE管理工具
 Name:		kde4-kdeadmin
-Version:	4.4.0
+Version:	4.4.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	a5fb36416b210e825db011c66a5695d3
+# Source0-md5:	6a69c96bf7ad38ea78972e926a2281e7
 Patch0:		%{name}-liloconfig.patch
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -44,6 +44,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	system-config-printer
 Requires:	shadow
+Obsoletes:	%{name}-kcmlilo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -179,7 +180,8 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
-%patch0 -p0
+# consider it obsolete?
+#%patch0 -p0
 
 %build
 install -d build
@@ -209,17 +211,17 @@
 %find_lang kuser	--with-kde
 #%find_lang knetworkconf --with-kde
 %ifarch %{ix86} %{x8664}
-%find_lang lilo-config	--with-kde
+#%find_lang lilo-config	--with-kde
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %ifarch %{ix86} %{x8664}
-%files kcmlilo -f lilo-config.lang
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde4/kcm_lilo.so
-%{_datadir}/kde4/services/lilo.desktop
+#%files kcmlilo -f lilo-config.lang
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/kde4/kcm_lilo.so
+#%{_datadir}/kde4/services/lilo.desktop
 %endif
 
 %files kcron -f kcron.lang
@@ -287,6 +289,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2010/02/27 12:08:14  shadzik
+- 4.4.1 try #1
+- no kcmlilo (?), main package obsoletes it
+
 Revision 1.66  2010/02/18 16:48:58  sparky
 - dropped unused BR: libjpeg-devel, xorg-lib-libXxf86misc-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeadmin/kde4-kdeadmin.spec?r1=1.66&r2=1.67&f=u