rpms/kdelibs/devel kdelibs.spec,1.590,1.591
Kevin Kofler
kkofler at fedoraproject.org
Wed Feb 10 01:38:22 UTC 2010
- Previous message: rpms/kdelibs/devel kdelibs.spec,1.589,1.590
- Next message: rpms/dogtag-pki-console-ui/devel .cvsignore, 1.2, 1.3 dogtag-pki-console-ui.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26352/devel
Modified Files:
kdelibs.spec
Log Message:
rm obsolete F8- conditionals
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -p -r1.590 -r1.591
--- kdelibs.spec 10 Feb 2010 01:36:32 -0000 1.590
+++ kdelibs.spec 10 Feb 2010 01:38:22 -0000 1.591
@@ -276,16 +276,6 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/m
# create/own, see http://bugzilla.redhat.com/483318
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
-%if "%{name}" != "kdelibs"
-# remove files which conflict with KDE 3
-rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
- %{buildroot}%{_kde4_bindir}/kunittestmodrunner
-rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
- %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
-rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
-rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
-%endif
-
# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
@@ -392,8 +382,7 @@ rm -rf %{buildroot}
%{_mandir}/man8/kded4.8*
%{_mandir}/man8/kdeinit4.8*
%{_mandir}/man8/meinproc4.8*
-# kdelibs-common comes from here for fedora >= 9
-%if "%{name}" == "kdelibs"
+# these are in kdelibs-common:
%exclude %{_kde4_configdir}/kdebug.areas
%exclude %{_kde4_configdir}/kdebugrc
%exclude %{_kde4_configdir}/ui/ui_standards.rc
@@ -420,7 +409,6 @@ rm -rf %{buildroot}
%{_kde4_appsdir}/kdeui
%{_kde4_docdir}/HTML/en/common/
%{_kde4_datadir}/locale/all_languages/
-%endif
%files devel
%defattr(-,root,root,-)
- Previous message: rpms/kdelibs/devel kdelibs.spec,1.589,1.590
- Next message: rpms/dogtag-pki-console-ui/devel .cvsignore, 1.2, 1.3 dogtag-pki-console-ui.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list