Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at 2015-03-05 15:32:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doxygen (Old) and /work/SRC/openSUSE:Factory/.doxygen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doxygen" Changes: -------- --- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2015-02-10 20:15:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new/doxygen.changes 2015-03-05 18:15:00.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 2 15:22:37 UTC 2015 - [email protected] + +- remove doxygen-html.sh + +------------------------------------------------------------------- +Fri Feb 20 11:40:19 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Split documentation to separate package +- Do not bundle pdf documentation +- Generate html documentation + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/doxygen/doxywizard.changes 2015-02-10 20:15:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new/doxywizard.changes 2015-03-05 18:15:00.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 20 11:41:18 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Enable tests + +------------------------------------------------------------------- Old: ---- doxygen-1.8.9.1-html.tar.bz2 doxygen-html.sh doxygen_manual-1.8.9.1.pdf.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.8CmRhq/_old 2015-03-05 18:15:01.000000000 +0100 +++ /var/tmp/diff_new_pack.8CmRhq/_new 2015-03-05 18:15:01.000000000 +0100 @@ -17,48 +17,26 @@ Name: doxygen -BuildRequires: bison -BuildRequires: flex -BuildRequires: gcc-c++ -BuildRequires: graphviz -BuildRequires: libpng-devel -BuildRequires: python-base -BuildRequires: python-xml -BuildRequires: unzip Version: 1.8.9.1 Release: 0 Summary: Automated C, C++, and Java Documentation Generator License: GPL-2.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 -# script to get %%source2 -Source1: doxygen-html.sh -Source2: %{name}-%{version}-html.tar.bz2 -Source3: ftp://ftp.stack.nl/pub/users/dimitri/doxygen_manual-%{version}.pdf.zip -Patch: %{name}-1.5.9-64archs.patch +Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz +Patch0: %{name}-1.5.9-64archs.patch Patch3: %{name}-1.5.9-man.patch Patch4: %{name}-1.7.0-modify_footer.patch Patch5: %{name}-no-lowercase-man-names.patch +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: graphviz +BuildRequires: libpng-devel +BuildRequires: python-base +BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build -######################################################################################### -# SuSE, openSUSE -######################################################################################### -%if 0%{?suse_version} -%define man_ext gz -%endif -######################################################################################### -# Fedora, RHEL or CentOS -######################################################################################### -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -%define man_ext gz -%endif -######################################################################################### -# Mandrake, Mandriva -######################################################################################### -%if 0%{?mandriva_version} || 0%{?mdkversion} -%define man_ext lzma -%endif %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -68,36 +46,55 @@ developed on a Linux platform, but it runs on most other UNIX flavors as well. An executable for Windows 95/NT is also available. +%package doc +Summary: Documentation for %{name} +Group: Documentation + +%description doc +Doxygen is a documentation system for C, C++, Java, and IDL. It can +generate an online class browser (in HTML) and an offline reference +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. An executable for Windows 95/NT is also available. + +This package contains only documentation + %prep -%setup -q -b 2 -%patch +%setup -q +%patch0 %patch3 %patch4 %patch5 -p1 -cp -v %{S:3} . -/usr/bin/unzip %{S:3} %build mintoc= %ifarch ppc64 mintoc="-DENGLISH_ONLY" %endif -sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS $mintoc@" tmake/lib/linux-g++/tmake.conf +sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = %{optflags} $mintoc@" tmake/lib/linux-g++/tmake.conf # custom configure script -./configure --prefix /usr --install /usr/bin/install +./configure --prefix %{_prefix} --install %{_bindir}/install make %{?_smp_mflags} +# generate html documentation +./bin/doxygen + %install -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/doxygen -make install INSTALL=$RPM_BUILD_ROOT/usr DOCDIR=$RPM_BUILD_ROOT%{_docdir}/doxygen -install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README.md VERSION $RPM_BUILD_ROOT%{_docdir}/doxygen -cp -a html $RPM_BUILD_ROOT%{_docdir}/doxygen -cp doxygen_manual-%{version}.pdf $RPM_BUILD_ROOT%{_docdir}/doxygen +install -d -m 755 %{buildroot}%{_docdir}/doxygen +make install INSTALL=%{buildroot}/usr DOCDIR=%{buildroot}%{_docdir}/doxygen +install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README.md VERSION %{buildroot}%{_docdir}/doxygen +cp -a doxygen_docs/html %{buildroot}%{_docdir}/%{name}-doc +%fdupes -s %{buildroot}%{_docdir}/%{name}-doc %files %defattr(-,root,root) -%doc %{_docdir}/doxygen -%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.%{man_ext} -%attr(755,root,root) /usr/bin/* +%doc LICENSE +%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.* +%attr(755,root,root) %{_bindir}/* + +%files doc +%defattr(-,root,root) +%doc %{_docdir}/%{name}-doc %changelog ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.8CmRhq/_old 2015-03-05 18:15:01.000000000 +0100 +++ /var/tmp/diff_new_pack.8CmRhq/_new 2015-03-05 18:15:01.000000000 +0100 @@ -17,47 +17,39 @@ Name: doxywizard -BuildRequires: bison -BuildRequires: flex -BuildRequires: gcc-c++ -BuildRequires: libjpeg-devel Version: 1.8.9.1 Release: 0 -Requires: doxygen = %{version} Summary: Graphical User Interface for Doxygen License: GPL-2.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 Source1: doxywizard.desktop -Patch: doxygen-1.5.9-64archs.patch +Patch0: doxygen-1.5.9-64archs.patch Patch2: %{name}-1.5.9-flex.patch Patch5: doxygen-1.5.9-man.patch +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -######################################################################################### -# SuSE, openSUSE -######################################################################################### %if 0%{?suse_version} BuildRequires: libqt4-devel >= 4.3 BuildRequires: update-desktop-files -%define man_ext gz %endif -######################################################################################### -# Fedora, RHEL or CentOS -######################################################################################### %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: desktop-file-utils BuildRequires: qt4-devel >= 4.3.0 -%define man_ext gz %endif -######################################################################################### -# Mandrake, Mandriva -######################################################################################### %if 0%{?mandriva_version} || 0%{?mdkversion} BuildRequires: libqt4-devel >= 4.3 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -%define man_ext lzma +%endif +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +BuildRequires: libxml2-tools +BuildRequires: texlive-bibtex %endif %description @@ -66,7 +58,7 @@ %prep %setup -q -n doxygen-%{version} -%patch +%patch0 %patch2 %patch5 @@ -79,7 +71,7 @@ export PATH=${QTDIR}/bin:${PATH} %endif %if 0%{?mandriva_version} || 0%{?mdkversion} -export QTDIR=/usr/lib/qt4/ +export QTDIR=%{_libexecdir}/qt4/ %if 0%{?mandriva_version} <= 2009 || 0%{?mdkversion} <= 200900 export PATH=${QTDIR}/bin:${PATH} %endif @@ -88,14 +80,19 @@ %ifarch ppc64 mintoc="-DENGLISH_ONLY" %endif -sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS $mintoc@" tmake/lib/linux-g++/tmake.conf +sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = %{optflags} $mintoc@" tmake/lib/linux-g++/tmake.conf # custom configure script ./configure --with-doxywizard make %{?_smp_mflags} +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +%check +make test %{?_smp_mflags} +%endif + %install -make install INSTALL=$RPM_BUILD_ROOT/usr -rm -f $RPM_BUILD_ROOT/usr/bin/{doxygen,doxytag} +make install INSTALL=%{buildroot}/usr +rm -f %{buildroot}%{_bindir}/{doxygen,doxytag} %if 0%{?suse_version} %suse_update_desktop_file -i doxywizard Development Documentation %endif @@ -106,25 +103,23 @@ install -d -m 755 %{buildroot}%{_datadir}/applications/ install %{SOURCE1} %{buildroot}%{_datadir}/applications/ %endif -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{doxygen,doxytag}.1 +rm -f %{buildroot}%{_mandir}/man1/{doxygen,doxytag}.1 %files %defattr(-,root,root) -%attr(755,root,root) /usr/bin/doxywizard +%attr(755,root,root) %{_bindir}/doxywizard %{_datadir}/applications/doxywizard.desktop -%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.%{man_ext} +%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.* %if 0%{?mandriva_version} || 0%{?mdkversion} - %post - %update_menus + %{update_menus} %{update_desktop_database} %endif %if 0%{?mandriva_version} || 0%{?mdkversion} - %postun - %clean_menus + %{clean_menus} %{clean_desktop_database} %endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
