- convert two specfiles into one

OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=185

doxygen.changes

@@ -11,6 +11,7 @@ Fri Jun 23 12:00:15 UTC 2023 - pgajdos@suse.com
   - Fix-boundingbox-parsing_part2.patch (upstreamed)
   - Fix-boundingbox-parsing_part3.patch (upstreamed)
   - Fix-boundingbox-parsing_part4.patch (upstreamed)
+- convert two specfiles into one
 
 -------------------------------------------------------------------
 Mon Apr 24 12:16:18 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

doxygen.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package doxygen
+# spec file
 #
 # Copyright (c) 2023 SUSE LLC
 #
@@ -21,7 +21,12 @@
 %bcond_with libclang
 %endif
 
-Name:           doxygen
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == ""
+%global flavor doxygen
+%endif
+
+Name:           %{flavor}
 Version:        1.9.7
 Release:        0
 Summary:        Automated C, C++, and Java Documentation Generator
@@ -50,7 +55,24 @@ Obsoletes:      doxygen-doc
 %if %{with libclang}
 BuildRequires:  llvm-clang-devel
 %endif
+%if "%{flavor}" == "doxywizard"
+BuildRequires:  libjpeg-devel
+BuildRequires:  pkgconfig
+BuildRequires:  python3-base
+BuildRequires:  python3-xml
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Xml)
+Requires:       doxygen = %{version}
+# for tests
+BuildRequires:  libxml2-tools
+BuildRequires:  texlive-bibtex
+# --
+%endif
 
+%if "%{flavor}" == "doxygen"
 %description
 Doxygen is a documentation system for C, C++, Java, and IDL. It can
 generate an online class browser (in HTML) and an offline reference
@@ -58,6 +80,13 @@ manual (in LaTeX) from a set of documented source files. The
 documentation is extracted directly from the sources. Doxygen is
 developed on a Linux platform, but it runs on most other UNIX flavors
 as well.
+%endif
+
+%if "%{flavor}" == "doxywizard"
+%description
+Doxywizard is a graphical front-end to read/edit/write doxygen
+configuration files.
+%endif
 
 %prep
 %setup -q
@@ -71,6 +100,9 @@ as well.
 
 %build
 %cmake \
+%if "%{flavor}" == "doxywizard"
+    -Dbuild_wizard=ON \
+%endif
     -Dbuild_doc=OFF \
     -Dbuild_xmlparser=ON \
     -Dbuild_search=OFF \
@@ -94,9 +126,34 @@ as well.
 mkdir -p %{buildroot}%{_mandir}/man1/
 install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/
 
+%if "%{flavor}" == "doxywizard"
+rm %{buildroot}%{_bindir}/doxygen
+mkdir -p %{buildroot}%{_mandir}/man1/
+install -m 644 doc/doxywizard.1 %{buildroot}%{_mandir}/man1/
+%suse_update_desktop_file -i doxywizard Development Documentation
+%endif
+
+%if "%{flavor}" == "doxywizard"
+%check
+# https://github.com/doxygen/doxygen/issues/10053
+rm -r testing/061*
+export LANG=C.UTF-8
+# testing doxygen package here to avoid build
+# cycle between latex and doxygen
+%ctest
+%endif
+
+%if "%{flavor}" == "doxygen"
 %files
 %license LICENSE
 %attr(644,root,root) %{_mandir}/man1/doxygen.1%{?ext_man}
 %attr(755,root,root) %{_bindir}/*
+%endif
+
+%if "%{flavor}" == "doxywizard"
+%attr(755,root,root) %{_bindir}/doxywizard
+%{_datadir}/applications/doxywizard.desktop
+%{_mandir}/man1/doxywizard.1%{?ext_man}
+%endif
 
 %changelog

doxywizard.spec

@@ -1,96 +0,0 @@
-#
-# spec file for package doxywizard
-#
-# Copyright (c) 2023 SUSE LLC
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-Name:           doxywizard
-Version:        1.9.7
-Release:        0
-Summary:        Graphical User Interface for Doxygen
-# qtools are used for building and they are GPL-3.0 licensed
-License:        GPL-2.0-or-later AND GPL-3.0-only
-Group:          Development/Tools/Doc Generators
-URL:            https://www.doxygen.nl/
-Source:         https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
-Source1:        doxywizard.desktop
-BuildRequires:  bison
-BuildRequires:  cmake >= 2.8.12
-BuildRequires:  flex
-%if 0%{?suse_version} <= 1500
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc-c++
-%endif
-BuildRequires:  libjpeg-devel
-BuildRequires:  pkgconfig
-BuildRequires:  python3-base
-BuildRequires:  python3-xml
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5Xml)
-Requires:       doxygen = %{version}
-%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
-# for make tests
-BuildRequires:  libxml2-tools
-BuildRequires:  texlive-bibtex
-%endif
-
-%description
-Doxywizard is a graphical front-end to read/edit/write doxygen
-configuration files.
-
-%prep
-%autosetup -p1 -n doxygen-%{version}
-
-%build
-%cmake \
-    -Dbuild_wizard=ON \
-%if 0%{?suse_version} <= 1500
-    -DCMAKE_C_COMPILER=gcc-9 \
-    -DCMAKE_CXX_COMPILER=g++-9 \
-%endif
-    -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" \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DBUILD_STATIC_LIBS=ON
-%cmake_build
-
-%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
-%check
-# https://github.com/doxygen/doxygen/issues/10053
-rm -r testing/061*
-export LANG=C.UTF-8
-# testing doxygen package here to avoid build
-# cycle between latex and doxygen
-%ctest
-%endif
-
-%install
-%cmake_install
-rm %{buildroot}%{_bindir}/doxygen
-mkdir -p %{buildroot}%{_mandir}/man1/
-install -m 644 doc/doxywizard.1 %{buildroot}%{_mandir}/man1/
-%suse_update_desktop_file -i doxywizard Development Documentation
-
-%files
-%attr(755,root,root) %{_bindir}/doxywizard
-%{_datadir}/applications/doxywizard.desktop
-%{_mandir}/man1/doxywizard.1%{?ext_man}
-
-%changelog