diff --git a/doxygen-1.8.14.src.tar.gz b/doxygen-1.8.17.src.tar.gz similarity index 39% rename from doxygen-1.8.14.src.tar.gz rename to doxygen-1.8.17.src.tar.gz index d728524616c09792d71f0c3b79a48417d4dcf5b7..c2ac8a81125d4ac26f2053ecb8ef59a7e05d8eb2 100644 Binary files a/doxygen-1.8.14.src.tar.gz and b/doxygen-1.8.17.src.tar.gz differ diff --git a/doxygen.spec b/doxygen.spec index ea2083f9e2d7718eace4b5ef5c06279cde13b500..0edfcdfd70f8c9276b99672fc5317f4794b79cfc 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,30 +1,23 @@ -%global xapian_core_support OFF - -Summary: Generate documentation from source code -Name: doxygen -Epoch: 1 -Version: 1.8.14 -Release: 10 -License: GPL+ -Url: http://www.doxygen.nl -Source0: https://sourceforge.net/projects/%{name}/files/rel-%{version}/%{name}-%{version}.src.tar.gz -Source2: doxywizard.desktop - -BuildRequires: gcc-c++ gcc perl-interpreter -%if ! 0%{?_module_build} -BuildRequires: tex(dvips) tex(latex) tex(multirow.sty) tex(sectsty.sty) tex(tocloft.sty) -BuildRequires: tex(xtab.sty) tex(import.sty) tex(tabu.sty) tex(appendix.sty) -BuildRequires: tex(adjustbox.sty) /usr/bin/epstopdf texlive-epstopdf -BuildRequires: ghostscript gettext desktop-file-utils graphviz -%else -BuildRequires: zlib-devel -%endif -BuildRequires: flex bison cmake +%global xapian_core_support ON +%global BuildDir Out +Name: doxygen +Epoch: 1 +Version: 1.8.17 +Release: 1 +Summary: A documentation system for C/C++ +License: GPL+ +Url: http://www.doxygen.nl +Source0: http://doxygen.nl/files/%{name}-%{version}.src.tar.gz +Source1: doxywizard.desktop +BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter +BuildRequires: tex(dvips) tex(latex) tex(multirow.sty) tex(sectsty.sty) tex(tocloft.sty) +BuildRequires: tex(xtab.sty) tex(import.sty) tex(tabu.sty) tex(appendix.sty) +BuildRequires: tex(adjustbox.sty) /usr/bin/epstopdf texlive-epstopdf ghostscript gettext +BuildRequires: desktop-file-utils graphviz flex bison cmake git %if %{xapian_core_support} == "ON" -BuildRequires: xapian-core-devel zlib-devel +BuildRequires: xapian-core-devel zlib-devel %endif -Requires: perl-interpreter - +Requires: perl-interpreter graphviz %description Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming @@ -32,118 +25,76 @@ languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl, and to some extent D. -%if ! 0%{?_module_build} %package doxywizard -Summary: A GUI for creating and editing configuration files -Requires: %{name} = %{epoch}:%{version}-%{release} -BuildRequires: qt5-qtbase-devel - +Summary: A GUI for creating and editing configuration files +Requires: %{name} = %{epoch}:%{version}-%{release} +BuildRequires: qt5-qtbase-devel %description doxywizard Doxywizard is a graphical front-end to read/edit/write doxygen configuration files. -%package latex -Summary: Support for producing latex/pdf output from doxygen -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: tex(latex) tex(multirow.sty) tex(sectsty.sty) tex(tocloft.sty) -Requires: tex(xtab.sty) tex(import.sty) tex(tabu.sty) tex(appendix.sty) -Requires: texlive-epstopdf-bin - -%description latex -%{summary}. -%endif - -%package_help - - %prep %autosetup -p1 - -iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.tmp -touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.tmp -mv LANGUAGE.HOWTO.tmp LANGUAGE.HOWTO +iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new +touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new +mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO %build -install -d %{_target_platform} -pushd %{_target_platform} +install -d %{BuildDir} +cd %{BuildDir} %cmake \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ - -Dbuild_xmlparser=ON \ -%if ! 0%{?_module_build} - -Dbuild_doc=ON \ + -Dbuild_doc=OFF \ -Dbuild_wizard=ON \ + -Dbuild_xmlparser=ON \ -Dbuild_search=%{xapian_core_support} \ -%else - -Dbuild_doc=OFF \ - -Dbuild_wizard=OFF \ - -Dbuild_search=OFF \ -%endif -DMAN_INSTALL_DIR=%{_mandir}/man1 \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ .. -popd - -%if ! 0%{?_module_build} -make docs %{?_smp_mflags} -C %{_target_platform} -%else -install -d *-openEuler-linux-gnu/latex -touch *-openEuler-linux-gnu/latex/doxygen_manual.pdf -%endif -%make_build -C %{_target_platform} +cd - +%make_build -C %{BuildDir} %install -%make_install -C %{_target_platform} -find %{_target_platform}/html -name struct*.pdf| xargs sed -i 's/<[0-9,A-F]\{32\}>/<011CC110A540190DBC7FD31B2A2E03B4>/g' - +%make_install -C %{BuildDir} +convert addon/doxywizard/doxywizard.ico doxywizard.png +icondir=%{buildroot}%{_datadir}/icons/hicolor +install -m755 -d $icondir/{16x16,32x32,48x48,128x128}/apps +install -m644 -p -D doxywizard-6.png $icondir/16x16/apps/doxywizard.png +install -m644 -p -D doxywizard-5.png $icondir/32x32/apps/doxywizard.png +install -m644 -p -D doxywizard-4.png $icondir/48x48/apps/doxywizard.png +install -m644 -p -D doxywizard-3.png $icondir/128x128/apps/doxywizard.png install -d %{buildroot}/%{_mandir}/man1 cp doc/*.1 %{buildroot}/%{_mandir}/man1/ - -%if ! 0%{?_module_build} -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} +%if %{xapian_core_support} == "OFF" +rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1* %endif +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} + +%check +make tests -C %{BuildDir} %files -%if ! 0%{?_module_build} +%doc LANGUAGE.HOWTO README.md +%license LICENSE +%{_bindir}/doxygen +%{_mandir}/man1/doxygen.1* %if %{xapian_core_support} == "ON" -%{_bindir}/doxyindexer -%{_bindir}/doxysearch* +%{_bindir}/{doxyindexer,doxysearch*} +%{_mandir}/man1/{doxyindexer.1*,doxysearch.1*} %endif -%endif -%{_bindir}/%{name} +%exclude %{_docdir}/packages -%if ! 0%{?_module_build} %files doxywizard %{_bindir}/doxywizard -%{_datadir}/applications/doxywizard.desktop -%endif - -%if ! 0%{?_module_build} -%files latex -%endif - -%files help -%doc LANGUAGE.HOWTO README.md -%if ! 0%{?_module_build} -%doc %{_target_platform}/latex/doxygen_manual.pdf -%doc %{_target_platform}/html -%endif -%exclude %{_docdir}/packages -%{_mandir}/man1/%{name}.1* -%if %{xapian_core_support} == "ON" -%{_mandir}/man1/doxyindexer.1* -%{_mandir}/man1/doxysearch.1* -%else -%exclude %{_mandir}/man1/doxyindexer.1* -%exclude %{_mandir}/man1/doxysearch.1* -%endif -%if ! 0%{?_module_build} %{_mandir}/man1/doxywizard* -%else -%exclude %{_mandir}/man1/doxywizard.1* -%endif +%{_datadir}/applications/doxywizard.desktop +%{_datadir}/icons/hicolor/*/apps/doxywizard.png %changelog +* Mon Aug 03 2020 pengyeqing - 1.8.17-1 +- Update to 1.8.17 + * Tue Dec 10 2019 mengxian - 1:1.8.14-8 - Package init diff --git a/doxywizard.desktop b/doxywizard.desktop index 44c22d89939c5180651ffd7010a3ba4c1d257299..f3d0a4ffcbdfeefe494c1170953814f62c5e633b 100644 --- a/doxywizard.desktop +++ b/doxywizard.desktop @@ -1,4 +1,6 @@ [Desktop Entry] -Name=Doxygen Wizard -Exec=doxywizard Type=Application +Exec=doxywizard +Name=Doxygen Wizard +Icon=doxywizard +Categories=Qt;Development;