rpms/kdevelop/devel kdevelop.spec,1.56,1.57
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Jun 18 03:22:33 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14672
Modified Files:
kdevelop.spec
Log Message:
* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-2
- merge missed changes from F-7 branch
- make qt-devel-doc/qt_ver detection more robust
Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdevelop.spec 18 Jun 2007 03:00:48 -0000 1.56
+++ kdevelop.spec 18 Jun 2007 03:21:58 -0000 1.57
@@ -12,7 +12,7 @@
Summary: Integrated Development Environment for C++/C
Epoch: 9
Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
URL: http://www.kdevelop.org/
@@ -37,15 +37,26 @@
Requires: qt-designer
Requires: gettext
Requires: ctags
+## Skip these, for now -- Rex
+#Requires(hint): htdig
+#Source3: kdevelop-htdig.conf
+#Requires(hint): kdelibs-apidocs
+#Requires(hint): ark
%if %{make_cvs}
BuildRequires: automake libtool
%endif
BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
+BuildRequires: kdelibs-apidocs qt-devel-docs
+%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
BuildRequires: db4-devel
BuildRequires: flex
+# for cvs plugin
+BuildRequires: kdesdk-devel
+BuildRequires: subversion-devel neon-devel
-Obsoletes: kdevelop-c_c++_ref
+## ancient, deprecated? -- Rex
+#Obsoletes: kdevelop-c_c++_ref
%description
The KDevelop Integrated Development Environment provides many features
@@ -71,6 +82,7 @@
development by adding it to the "Tools"-menu according to your
individual needs.
+
%prep
%setup -q -a1
@@ -107,7 +119,7 @@
%if %{final}
--enable-final \
%endif
- --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_version}/html/ \
+ --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_ver}/html/ \
--with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \
--with-extra-libs=%{_libdir}
@@ -145,8 +157,8 @@
%files
-%defattr(-,root,root)
-%doc %{_docdir}/HTML/en/*
+%defattr(-,root,root,-)
+%{_docdir}/HTML/en/*
%{_bindir}/*
%{_libdir}/kde3/*
%{_libdir}/lib*
@@ -156,7 +168,8 @@
%{_datadir}/apps/*
%config %{_datadir}/config/*
%{_datadir}/desktop-directories/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/application/*
%{_datadir}/mimelnk/text/*
%{_datadir}/services/*
@@ -164,6 +177,10 @@
%changelog
+* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-2
+- merge missed changes from F-7 branch
+- make qt-devel-doc/qt_ver detection more robust
+
* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-1
- cleanup
More information about the fedora-extras-commits
mailing list