rpms/kdeadmin/F-11 kdeadmin.spec,1.138,1.139 sources,1.67,1.68
Than Ngo
than at fedoraproject.org
Sat Dec 5 13:06:45 UTC 2009
- Previous message (by thread): rpms/iverilog/F-12 .cvsignore, 1.11, 1.12 import.log, 1.5, 1.6 iverilog.spec, 1.14, 1.15 sources, 1.12, 1.13
- Next message (by thread): rpms/ghdl/F-12 ghdl.spec,1.55,1.56 ghdl-svn130.patch,1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23301
Modified Files:
kdeadmin.spec sources
Log Message:
4.3.4
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- kdeadmin.spec 9 Nov 2009 13:09:00 -0000 1.138
+++ kdeadmin.spec 5 Dec 2009 13:06:44 -0000 1.139
@@ -1,4 +1,3 @@
-
%if 0%{?fedora}
%define system_config_printer_kde 1
%define include_kpackage 1
@@ -7,8 +6,8 @@
Name: kdeadmin
Summary: K Desktop Environment - Administrative tools
Epoch: 7
-Version: 4.3.3
-Release: 1%{?dist}
+Version: 4.3.4
+Release: 2%{?dist}
Group: User Interface/Desktops
License: GPLv2
@@ -70,6 +69,15 @@ a CUPS print server.
%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} ..
@@ -160,6 +168,12 @@ fi
%changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- fix rhel conditionals
+
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
* 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.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources 9 Nov 2009 13:09:00 -0000 1.67
+++ sources 5 Dec 2009 13:06:44 -0000 1.68
@@ -1 +1 @@
-f83af0034fd1f040ec8eb8b3baa3301a kdeadmin-4.3.3.tar.bz2
+718e117023e93862bed23182b7d1c5d6 kdeadmin-4.3.4.tar.bz2
- Previous message (by thread): rpms/iverilog/F-12 .cvsignore, 1.11, 1.12 import.log, 1.5, 1.6 iverilog.spec, 1.14, 1.15 sources, 1.12, 1.13
- Next message (by thread): rpms/ghdl/F-12 ghdl.spec,1.55,1.56 ghdl-svn130.patch,1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list