rpms/kdevelop/devel kdevelop.spec,1.87,1.88
Rex Dieter
rdieter at fedoraproject.org
Sat Sep 12 23:53:24 UTC 2009
- Previous message (by thread): rpms/supybot-meetbot/EL-5 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 supybot-meetbot.spec, 1.4, 1.5
- Next message (by thread): rpms/busybox/devel busybox-static.config, NONE, 1.1 .cvsignore, 1.30, 1.31 busybox-petitboot.config, 1.1, 1.2 busybox.spec, 1.101, 1.102 sources, 1.30, 1.31 uClibc.config, 1.2, 1.3 busybox-1.12.1-selinux.patch, 1.1, NONE busybox-1.12.1-static.patch, 1.2, NONE busybox-1.14.1-readlink.patch, 1.1, NONE busybox-1.2.0-ppc64.patch, 1.1, NONE busybox-1.2.2-ls.patch, 1.2, NONE busybox-1.5.1-clean.patch, 1.1, NONE busybox-1.9.0-gc-section.patch, 1.1, NONE busybox-1.9.0-msh.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1092
Modified Files:
kdevelop.spec
Log Message:
* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
- make -libs unconditional
- Requires: kdebase3 (#507653)
Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kdevelop.spec 25 Jul 2009 04:30:14 -0000 1.87
+++ kdevelop.spec 12 Sep 2009 23:53:23 -0000 1.88
@@ -11,16 +11,11 @@
%define make_cvs 1
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
-
Name: kdevelop
Summary: Integrated Development Environment for C++/C
Epoch: 9
Version: 3.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
URL: http://www.kdevelop.org/
@@ -40,17 +35,11 @@ Patch4: kdevelop-3.5.2-kde4template.patc
Provides: kdevelop3 = %{version}-%{release}
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
-
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdelibs3-devel >= %{kde_version}
+# embedded konsole (#507653)
+Requires: kdebase3
Requires: make
Requires: perl
Requires: automake libtool
@@ -122,23 +111,21 @@ individual needs.
Summary: Development files for %{name}
Group: Development/Libraries
Provides: kdevelop3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdelibs3-devel
%description devel
%{summary}.
-%if 0%{?libs}
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: kdelibs3 >= %{version}
# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdevelop < 9:3.5.4-6
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
%{summary}.
-%endif
@@ -203,7 +190,6 @@ rm -rf %{buildroot}%{_prefix}/kdevbdb
%post
-%{!?libs:/sbin/ldconfig}
for f in hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -211,18 +197,15 @@ done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
-%{!?libs:/sbin/ldconfig}
for f in hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%if 0%{?libs}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%endif
%clean
@@ -246,10 +229,8 @@ rm -rf %{buildroot}
%{_datadir}/services/*
%{_datadir}/servicetypes/*
-%if 0%{?libs}
%files libs
%defattr(-,root,root,-)
-%endif
%{_libdir}/lib*.so.*
%{_libdir}/lib*.la
@@ -260,6 +241,10 @@ rm -rf %{buildroot}
%changelog
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
+- make -libs unconditional
+- Requires: kdebase3 (#507653)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9:3.5.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/supybot-meetbot/EL-5 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 supybot-meetbot.spec, 1.4, 1.5
- Next message (by thread): rpms/busybox/devel busybox-static.config, NONE, 1.1 .cvsignore, 1.30, 1.31 busybox-petitboot.config, 1.1, 1.2 busybox.spec, 1.101, 1.102 sources, 1.30, 1.31 uClibc.config, 1.2, 1.3 busybox-1.12.1-selinux.patch, 1.1, NONE busybox-1.12.1-static.patch, 1.2, NONE busybox-1.14.1-readlink.patch, 1.1, NONE busybox-1.2.0-ppc64.patch, 1.1, NONE busybox-1.2.2-ls.patch, 1.2, NONE busybox-1.5.1-clean.patch, 1.1, NONE busybox-1.9.0-gc-section.patch, 1.1, NONE busybox-1.9.0-msh.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list