SHA256
1
0
forked from pool/doxygen

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
This commit is contained in:
Martin Pluskal 2017-11-07 15:29:18 +00:00 committed by Git OBS Bridge
parent 3e26a75f4f
commit 728dc2459e
6 changed files with 35 additions and 19 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}/*

View File

@ -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

View File

@ -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