From 728dc2459e3c8969c6f09f58bebc070198234b24c8577343ed18d7e54ffc0d7a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 7 Nov 2017 15:29:18 +0000 Subject: [PATCH 1/2] Accepting request 539507 from home:pluskalm:branches:devel:tools - Explicitly require python2 for building - Use more cmake macros - Run spec-cleaner - Explicitly require python2 for building - Use more cmake macros - Run spec-cleaner - Explicitly require python2 for building - Use more cmake macros - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/539507 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=122 --- doxygen-doc.changes | 7 +++++++ doxygen-doc.spec | 10 ++++------ doxygen.changes | 7 +++++++ doxygen.spec | 10 ++++------ doxywizard.changes | 7 +++++++ doxywizard.spec | 13 ++++++------- 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/doxygen-doc.changes b/doxygen-doc.changes index 5e13ce5..5a20492 100644 --- a/doxygen-doc.changes +++ b/doxygen-doc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 7 12:20:10 UTC 2017 - mpluskal@suse.com + +- Explicitly require python2 for building +- Use more cmake macros +- Run spec-cleaner + ------------------------------------------------------------------- Tue Feb 14 08:09:53 UTC 2017 - foss@grueninger.de diff --git a/doxygen-doc.spec b/doxygen-doc.spec index 34c933c..23ca6b9 100644 --- a/doxygen-doc.spec +++ b/doxygen-doc.spec @@ -33,12 +33,12 @@ BuildRequires: cmake >= 2.8.12 BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ -# see graphviz.spec: +# see graphviz.spec: # "If you need output in png format you also need to install graphviz-gnome." BuildRequires: graphviz-gnome BuildRequires: poppler-tools -BuildRequires: python-base -BuildRequires: python-xml +BuildRequires: python2-base +BuildRequires: python2-xml BuildRequires: texlive-appendix BuildRequires: texlive-colortbl BuildRequires: texlive-courier @@ -64,7 +64,6 @@ BuildRequires: texlive-wasy BuildRequires: texlive-wasy2-ps BuildRequires: texlive-wasysym BuildRequires: texlive-xtab -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -77,7 +76,7 @@ as well. This package contains only documentation %prep -%setup -q -n doxygen-%{version} +%setup -q -n doxygen-%{version} %patch3 -p1 %ifarch ppc64le # see bnc#921577 @@ -103,7 +102,6 @@ rm -r %{buildroot}%{_mandir}/man1/ %fdupes -s %{buildroot}%{_docdir}/%{name}-doc %files -%defattr(-,root,root) %doc %{_docdir}/%{name} %changelog diff --git a/doxygen.changes b/doxygen.changes index bb67eca..b9c2424 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 7 12:19:34 UTC 2017 - mpluskal@suse.com + +- Explicitly require python2 for building +- Use more cmake macros +- Run spec-cleaner + ------------------------------------------------------------------- Fri Jun 2 13:14:24 UTC 2017 - meissner@suse.com diff --git a/doxygen.spec b/doxygen.spec index e9b5936..25756c7 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -40,9 +40,8 @@ BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: python-base -BuildRequires: python-xml -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python2-base +BuildRequires: python2-xml %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -60,7 +59,7 @@ as well. %ifarch ppc64le ppc64 %patch4 -p1 %endif -%patch6 -p0 +%patch6 %patch7 -p1 %build @@ -72,7 +71,7 @@ as well. -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" -make %{?_smp_mflags} +%make_jobs %install %cmake_install @@ -80,7 +79,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ %files -%defattr(-,root,root) %doc LICENSE %attr(444,root,root) %{_mandir}/man1/doxygen.1.gz %attr(755,root,root) %{_bindir}/* diff --git a/doxywizard.changes b/doxywizard.changes index 1c7c259..33cfdd2 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 7 12:20:18 UTC 2017 - mpluskal@suse.com + +- Explicitly require python2 for building +- Use more cmake macros +- Run spec-cleaner + ------------------------------------------------------------------- Wed Feb 22 07:08:16 UTC 2017 - foss@grueninger.de diff --git a/doxywizard.spec b/doxywizard.spec index b1d52bb..d08adfc 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -32,7 +32,10 @@ BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel -BuildRequires: python-xml +BuildRequires: python2-base +BuildRequires: python2-xml +BuildRequires: update-desktop-files +Requires: doxygen = %{version} %if 0%{?suse_version} < 1320 BuildRequires: libqt4-devel >= 4.3 %else @@ -41,9 +44,6 @@ BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) %endif -BuildRequires: update-desktop-files -Requires: doxygen = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 # for make tests BuildRequires: libxml2-tools @@ -66,7 +66,7 @@ export CXXFLAGS="%{optflags} -fPIC" -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" -make %{?_smp_mflags} +%make_jobs %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %check @@ -85,9 +85,8 @@ install -m 644 doc/doxywizard.1 %{buildroot}%{_mandir}/man1/ %suse_update_desktop_file -i doxywizard Development Documentation %files -%defattr(-,root,root) %attr(755,root,root) %{_bindir}/doxywizard %{_datadir}/applications/doxywizard.desktop -%{_mandir}/man1/doxywizard.1.gz +%{_mandir}/man1/doxywizard.1%{ext_man} %changelog From b25d38a8e8da3c5345e04606b073cbba44b659b3c3933edbfc7991189176b601 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 10 Nov 2017 13:20:33 +0000 Subject: [PATCH 2/2] - Update licensing information - Update licensing information - Update licensing information OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=123 --- doxygen-doc.changes | 5 +++++ doxygen-doc.spec | 3 ++- doxygen.changes | 5 +++++ doxygen.spec | 3 ++- doxywizard.changes | 5 +++++ doxywizard.spec | 3 ++- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/doxygen-doc.changes b/doxygen-doc.changes index 5a20492..60d6448 100644 --- a/doxygen-doc.changes +++ b/doxygen-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 10 13:21:16 UTC 2017 - mpluskal@suse.com + +- Update licensing information + ------------------------------------------------------------------- Tue Nov 7 12:20:10 UTC 2017 - mpluskal@suse.com diff --git a/doxygen-doc.spec b/doxygen-doc.spec index 23ca6b9..f2d6fe0 100644 --- a/doxygen-doc.spec +++ b/doxygen-doc.spec @@ -20,7 +20,8 @@ Name: doxygen-doc Version: 1.8.13 Release: 0 Summary: Automated C, C++, and Java Documentation Generator -License: GPL-2.0+ +# qtools are used for building and they are GPL-3.0 licensed +License: GPL-2.0+ AND GPL-3.0 Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz diff --git a/doxygen.changes b/doxygen.changes index b9c2424..0259a45 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 10 13:21:04 UTC 2017 - mpluskal@suse.com + +- Update licensing information + ------------------------------------------------------------------- Tue Nov 7 12:19:34 UTC 2017 - mpluskal@suse.com diff --git a/doxygen.spec b/doxygen.spec index 25756c7..855a479 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -20,7 +20,8 @@ Name: doxygen Version: 1.8.13 Release: 0 Summary: Automated C, C++, and Java Documentation Generator -License: GPL-2.0+ +# qtools are used for building and they are GPL-3.0 licensed +License: GPL-2.0+ AND GPL-3.0 Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz diff --git a/doxywizard.changes b/doxywizard.changes index 33cfdd2..a3365ab 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 10 13:21:26 UTC 2017 - mpluskal@suse.com + +- Update licensing information + ------------------------------------------------------------------- Tue Nov 7 12:20:18 UTC 2017 - mpluskal@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index d08adfc..757fe6e 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -20,7 +20,8 @@ Name: doxywizard Version: 1.8.13 Release: 0 Summary: Graphical User Interface for Doxygen -License: GPL-2.0+ +# qtools are used for building and they are GPL-3.0 licensed +License: GPL-2.0+ AND GPL-3.0 Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz