rpms/kdeadmin/devel .cvsignore, 1.64, 1.65 kdeadmin.spec, 1.145, 1.146 sources, 1.66, 1.67 kdeadmin-4.2.98-knetworkconf.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15955

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kdeadmin-4.2.98-knetworkconf.patch 
Log Message:
4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	21 Jul 2009 21:47:05 -0000	1.64
+++ .cvsignore	29 Jul 2009 22:09:31 -0000	1.65
@@ -2,3 +2,4 @@ kdeadmin-4.2.90.tar.bz2
 kdeadmin-4.2.95.tar.bz2
 kdeadmin-4.2.96.tar.bz2
 kdeadmin-4.2.98.tar.bz2
+kdeadmin-4.3.0.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- kdeadmin.spec	27 Jul 2009 11:16:50 -0000	1.145
+++ kdeadmin.spec	29 Jul 2009 22:09:32 -0000	1.146
@@ -1,12 +1,13 @@
-%if 0%{?rhel} == 0
+%if 0%{?rhel} == 1
 %define system_config_printer_kde 1
+%define include_kpackage 1
 %endif
 
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.2.98
-Release:        4%{?dist}
+Version:        4.3.0
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -21,7 +22,6 @@ Source2:        kuser.pamd
 Patch0:         kdeadmin-4.2.85-printing.patch
 
 # upstream patches
-Patch100:       kdeadmin-4.2.98-knetworkconf.patch
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -66,7 +66,6 @@ a CUPS print server.
 %patch0 -p1 -b .printing
 
 # upstream patches
-%patch100 -p1 -b .fedora
 
 %build
 
@@ -103,6 +102,7 @@ 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 || :
 
@@ -114,7 +114,7 @@ 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,-)
@@ -139,6 +139,7 @@ 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
@@ -147,6 +148,7 @@ fi
 %{_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
@@ -157,6 +159,12 @@ fi
 
 
 %changelog
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Tue Jul 28 2009 Than Ngo <than at redhat.com> - 4.2.98-5
+- don't include kpackage fo rhel
+
 * Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-4
 - don't include system_config_printer_kde for rhel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	21 Jul 2009 21:47:05 -0000	1.66
+++ sources	29 Jul 2009 22:09:32 -0000	1.67
@@ -1 +1 @@
-dac1a55360fec5724a6214df7d1fd1a0  kdeadmin-4.2.98.tar.bz2
+4712ade616d3c3a987281d24326ee9af  kdeadmin-4.3.0.tar.bz2


--- kdeadmin-4.2.98-knetworkconf.patch DELETED ---