rpms/kdeadmin/F-12 .cvsignore, 1.73, 1.74 kdeadmin.spec, 1.156, 1.157 sources, 1.74, 1.75 kdeadmin-4.3.95-system_config_printer_fix.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Sat Apr 3 14:31:59 UTC 2010


Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4665

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kdeadmin-4.3.95-system_config_printer_fix.patch 
Log Message:
* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.4.2-1
- 4.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-12/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	1 Mar 2010 16:32:14 -0000	1.73
+++ .cvsignore	3 Apr 2010 14:31:59 -0000	1.74
@@ -1 +1 @@
-kdeadmin-4.4.1.tar.bz2
+kdeadmin-4.4.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-12/kdeadmin.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdeadmin.spec	1 Mar 2010 16:32:14 -0000	1.156
+++ kdeadmin.spec	3 Apr 2010 14:31:59 -0000	1.157
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        KDE Administrative tools
 Epoch:          7
-Version:        4.4.1
+Version:        4.4.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -19,9 +19,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch0:         kdeadmin-4.2.85-printing.patch
 
 ## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=219751#c9
-Patch100: kdeadmin-4.3.95-system_config_printer_fix.patch
-
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -59,15 +56,14 @@ a CUPS print server.
 %patch0 -p1 -b .printing
 
 # upstream patches
-%patch100 -p1 -b .system_config_printer_fix
-
-
-%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
 
+
+%build
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -134,6 +130,9 @@ fi
 
 
 %changelog
+* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.4.2-1
+- 4.4.2
+
 * Sat Feb 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 7:4.4.1-1
 - 4.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-12/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	1 Mar 2010 16:32:14 -0000	1.74
+++ sources	3 Apr 2010 14:31:59 -0000	1.75
@@ -1 +1 @@
-6a69c96bf7ad38ea78972e926a2281e7  kdeadmin-4.4.1.tar.bz2
+92d80ac84525c8160f42bf54ee6351df  kdeadmin-4.4.2.tar.bz2


--- kdeadmin-4.3.95-system_config_printer_fix.patch DELETED ---



More information about the scm-commits mailing list