From bb6e0e00ddcda52a667549d0053a8abb65ab3ea5 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 18 Aug 2010 02:55:53 +0200 Subject: [PATCH 1/9] * Wed Aug 18 2010 Kevin Kofler - 4.5.0-3 - generate QCH apidocs (try 1) --- kdelibs.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index 1df5b3d..2438729 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -10,7 +10,7 @@ Summary: KDE Libraries Version: 4.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -254,7 +254,9 @@ make %{?_smp_mflags} -C %{_target_platform} # build apidocs %if 0%{?apidocs} export QTDOCDIR=`pkg-config --variable=docdir Qt` -doc/api/doxygen.sh . +export PROJECT_NAME="%{name}" +export PROJECT_VERSION="%{version}%{?alphatag}" +doc/api/doxygen.sh --qhppages . %endif @@ -449,6 +451,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 18 2010 Kevin Kofler - 4.5.0-3 +- generate QCH apidocs (try 1) + * Tue Aug 10 2010 Rex Dieter - 4.5.0-2 - (Build)Requires: qt4(-devel) >= 4.6.3 - dbusmenu_qt_ver 0.5.2, soprano_ver 4.5.0 From 5dda981d9c34253488123280812cd29c70596fc4 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 18 Aug 2010 05:16:20 +0200 Subject: [PATCH 2/9] * Wed Aug 18 2010 Kevin Kofler - 4.5.0-4 - package QCH apidocs (-apidocs-qch noarch subpackage) --- kdelibs.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index 2438729..c462912 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -10,7 +10,7 @@ Summary: KDE Libraries Version: 4.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -213,6 +213,20 @@ BuildArch: noarch This package includes the KDE 4 API documentation in HTML format for easy browsing. +%package apidocs-qch +Group: Development/Documentation +Summary: KDE 4 API documentation for Qt Assistant +# Not strictly required -- Rex +# Requires: %{name} = %{?epoch:%{epoch}:}%{version} +# Directory ownership (%{_qt4_docdir}/qch) +Requires: qt4 +Provides: kdelibs4-apidocs-qch = %{version}-%{release} +BuildArch: noarch + +%description apidocs-qch +This package includes the KDE 4 API documentation in Qt Assistant QCH +format for use with the Qt 4 Assistant or KDevelop 4. + %prep %setup -q -n kdelibs-%{version}%{?alphatag} @@ -304,6 +318,9 @@ install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp + +mkdir -p %{buildroot}%{_qt_docdir} +cp -a qch %{buildroot}%{_qt4_docdir}/qch %endif @@ -447,10 +464,17 @@ rm -rf %{buildroot} %files apidocs %defattr(-,root,root,-) %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ + +%files apidocs-qch +%defattr(-,root,root,-) +%{_qt4_docdir}/qch/*.qch %endif %changelog +* Wed Aug 18 2010 Kevin Kofler - 4.5.0-4 +- package QCH apidocs (-apidocs-qch noarch subpackage) + * Wed Aug 18 2010 Kevin Kofler - 4.5.0-3 - generate QCH apidocs (try 1) From 3da017382df6a26f748c4f40bcfb98eac57d11cd Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 18 Aug 2010 05:58:07 +0200 Subject: [PATCH 3/9] Fix a typo in my previous commit. --- kdelibs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index c462912..9f682be 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -319,7 +319,7 @@ mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp -mkdir -p %{buildroot}%{_qt_docdir} +mkdir -p %{buildroot}%{_qt4_docdir} cp -a qch %{buildroot}%{_qt4_docdir}/qch %endif From 337333e54a4bb256f252f9338fa245747f844098 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 18 Aug 2010 07:40:16 +0200 Subject: [PATCH 4/9] * Wed Aug 18 2010 Kevin Kofler - 4.5.0-5 - fix packaging of QCH apidocs --- kdelibs.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index 9f682be..e4dd50f 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -10,7 +10,7 @@ Summary: KDE Libraries Version: 4.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -317,10 +317,16 @@ install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %if 0%{?apidocs} mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs -rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp +rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \ + %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \ + %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp -mkdir -p %{buildroot}%{_qt4_docdir} -cp -a qch %{buildroot}%{_qt4_docdir}/qch +mkdir -p %{buildroot}%{_qt4_docdir}/qch +for i in %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/qch +do + mv -f "$i"/* %{buildroot}%{_qt4_docdir}/qch/ + rmdir "$i" +done %endif @@ -472,6 +478,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 18 2010 Kevin Kofler - 4.5.0-5 +- fix packaging of QCH apidocs + * Wed Aug 18 2010 Kevin Kofler - 4.5.0-4 - package QCH apidocs (-apidocs-qch noarch subpackage) From 510abf9c752edca5176c89226e4213d64a6515b6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 26 Aug 2010 13:20:51 -0500 Subject: [PATCH 5/9] - use ca-certificates' ca-bundle.crt (#521902) --- kdelibs.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index e4dd50f..89e5f1c 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -10,7 +10,7 @@ Summary: KDE Libraries Version: 4.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Name: kdelibs Epoch: 6 @@ -28,6 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde-filesystem >= 4-23 BuildRequires: docbook-dtds docbook-style-xsl +Requires: ca-certificates %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version} Requires: docbook-dtds docbook-style-xsl @@ -288,6 +289,14 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin mkdir -p %{buildroot}%{_kde4_libdir}/plugins/{gui_platform,styles} +## use ca-certificates' ca-bundle.crt, symlink as what most other +## distros do these days (http://bugzilla.redhat.com/521902) +if [ -f %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt -a \ + -f /etc/pki/tls/certs/ca-bundle.crt ]; then + ln -sf /etc/pki/tls/certs/ca-bundle.crt \ + %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt +fi + # move devel symlinks mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel pushd %{buildroot}%{_kde4_libdir} @@ -478,6 +487,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 26 2010 Rex Dieter - 4.5.0-6 +- use ca-certificates' ca-bundle.crt (#521902) + * Wed Aug 18 2010 Kevin Kofler - 4.5.0-5 - fix packaging of QCH apidocs From 96c577407fa69ebbdcc48d4bad1f04cb4cfe8f96 Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Fri, 27 Aug 2010 16:39:09 +0200 Subject: [PATCH 6/9] 4.5.1 --- .gitignore | 2 +- kdelibs.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f5f2f0c..06b7e74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -kdelibs-4.5.0.tar.bz2 +kdelibs-4.5.1.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index 89e5f1c..c9c9cf5 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -9,8 +9,8 @@ %define apidocs 1 Summary: KDE Libraries -Version: 4.5.0 -Release: 6%{?dist} +Version: 4.5.1 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -487,6 +487,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 27 2010 Jaroslav Reznik - 4.5.1-1 +- 4.5.1 + * Thu Aug 26 2010 Rex Dieter - 4.5.0-6 - use ca-certificates' ca-bundle.crt (#521902) diff --git a/sources b/sources index 957325b..e469816 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5da80f7549924808a394e6f8fb477212 kdelibs-4.5.0.tar.bz2 +f91f16b4349f8a2ca41dab5ca95f3877 kdelibs-4.5.1.tar.bz2 From 6b2c5a32fd3ff94e1e734b1b8253b11fb9192f91 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 27 Aug 2010 11:06:49 -0500 Subject: [PATCH 7/9] +knewstuff_gpg2 patch --- kdelibs-4.5.1-knewstuff_gpg2.patch | 78 ++++++++++++++++++++++++++++++ kdelibs.spec | 8 ++- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.5.1-knewstuff_gpg2.patch diff --git a/kdelibs-4.5.1-knewstuff_gpg2.patch b/kdelibs-4.5.1-knewstuff_gpg2.patch new file mode 100644 index 0000000..4244642 --- /dev/null +++ b/kdelibs-4.5.1-knewstuff_gpg2.patch @@ -0,0 +1,78 @@ +diff -up kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp +--- kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 2009-11-30 18:27:20.000000000 -0600 ++++ kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp 2010-08-27 10:49:10.619703933 -0500 +@@ -61,7 +61,7 @@ void Security::readKeys() + m_runMode = List; + m_keys.clear(); + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -87,7 +87,7 @@ void Security::readSecretKeys() + } + m_runMode = ListSecret; + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -258,7 +258,7 @@ void Security::slotCheckValidity() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +@@ -340,7 +340,7 @@ void Security::slotSignFile() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +diff -up kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp +--- kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 2009-11-30 18:27:19.000000000 -0600 ++++ kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp 2010-08-27 10:49:50.493454042 -0500 +@@ -61,7 +61,7 @@ void Security::readKeys() + m_runMode = List; + m_keys.clear(); + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -87,7 +87,7 @@ void Security::readSecretKeys() + } + m_runMode = ListSecret; + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -258,7 +258,7 @@ void Security::slotCheckValidity() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +@@ -340,7 +340,7 @@ void Security::slotSignFile() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" diff --git a/kdelibs.spec b/kdelibs.spec index c9c9cf5..4a2ff5e 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -81,7 +81,11 @@ Patch24: kdelibs-4.3.1-drkonq.patch # -DCMAKE_SKIP_RPATH:BOOL=ON (finally) Patch27: kdelibs-4.4.80-no_rpath.patch -# upstreamable +## upstreamable +# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/ +# reverting to our past gnupg2-only setup. +# TODO: try to use either gpg or gpg2, whichever is available +Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch ## 4.4 upstream @@ -247,6 +251,7 @@ format for use with the Qt 4 Assistant or KDevelop 4. %patch27 -p1 -b .no_rpath # upstreamable patches +%patch50 -p1 -b .knewstuff_gpg2 # upstream patches @@ -489,6 +494,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 27 2010 Jaroslav Reznik - 4.5.1-1 - 4.5.1 +- use gpg2 in knewstuff (kde#249152) * Thu Aug 26 2010 Rex Dieter - 4.5.0-6 - use ca-certificates' ca-bundle.crt (#521902) From 30a8071b34fee86e28bf011215a3c0588979cb3b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 27 Aug 2010 12:24:39 -0500 Subject: [PATCH 8/9] - -apidocs : exclude installdox --- kdelibs.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index 4a2ff5e..a6679ef 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -10,7 +10,7 @@ Summary: KDE Libraries Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -331,6 +331,7 @@ install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %if 0%{?apidocs} mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';' rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \ %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \ %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp @@ -492,6 +493,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 27 2010 Rex Dieter - 4.5.1-2 +- -apidocs : exclude installdox + * Fri Aug 27 2010 Jaroslav Reznik - 4.5.1-1 - 4.5.1 - use gpg2 in knewstuff (kde#249152) From df86e87ee650afb48ba36952b9ce1c285351a65d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 28 Aug 2010 00:40:51 +0200 Subject: [PATCH 9/9] * Fri Aug 27 2010 Kevin Kofler - 4.5.1-3 - make building -apidocs-qch optional and disable it by default until fixed --- kdelibs.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index a6679ef..2a3fe81 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -7,10 +7,12 @@ %define strigi_ver 0.7.2 # to build/include apidocs or not %define apidocs 1 +# to build/include QCH apidocs or not (currently broken) +#define apidocs_qch 1 Summary: KDE Libraries Version: 4.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -274,9 +276,13 @@ make %{?_smp_mflags} -C %{_target_platform} # build apidocs %if 0%{?apidocs} export QTDOCDIR=`pkg-config --variable=docdir Qt` +%if 0%{?apidocs_qch} export PROJECT_NAME="%{name}" export PROJECT_VERSION="%{version}%{?alphatag}" doc/api/doxygen.sh --qhppages . +%else +doc/api/doxygen.sh . +%endif %endif @@ -336,6 +342,7 @@ rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \ %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \ %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp +%if 0%{?apidocs_qch} mkdir -p %{buildroot}%{_qt4_docdir}/qch for i in %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/qch do @@ -343,6 +350,7 @@ do rmdir "$i" done %endif +%endif %post @@ -486,13 +494,18 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%if 0%{?apidocs_qch} %files apidocs-qch %defattr(-,root,root,-) %{_qt4_docdir}/qch/*.qch %endif +%endif %changelog +* Fri Aug 27 2010 Kevin Kofler - 4.5.1-3 +- make building -apidocs-qch optional and disable it by default until fixed + * Fri Aug 27 2010 Rex Dieter - 4.5.1-2 - -apidocs : exclude installdox