Merge branch 'licensing'

This commit is contained in:
Michael J Gruber 2013-08-08 16:42:57 +02:00
commit 6c3ccef604

View File

@ -1,19 +1,23 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: dblatex Name: dblatex
Version: 0.3.4 Version: 0.3.4
Release: 7%{?dist} Release: 8%{?dist}
Summary: DocBook to LaTeX/ConTeXt Publishing Summary: DocBook to LaTeX/ConTeXt Publishing
BuildArch: noarch BuildArch: noarch
Group: Applications/Publishing # Most of package is GPLv2+, except:
License: GPLv2+ # xsl/ directory is DMIT
URL: http://dblatex.sourceforge.net/ # lib/dbtexmf/core/sgmlent.txt is Public Domain
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 # latex/misc/enumitem.sty, multirow2.sry and ragged2e.sty are LPPL
#Source1: http://docbook.sourceforge.net/release/xsl/current/COPYING # latex/misc/lastpage.sty is GPLv2 (no +)
Source1: COPYING-docbook-xsl # latex/misc/passivetex is MIT (not included in binary RPM so not listed)
Patch0: dblatex-0.2.7-external-which.patch License: GPLv2+ and GPLv2 and LPPL and DMIT and Public Domain
Patch1: dblatex-disable-debian.patch URL: http://dblatex.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# Source1 is from http://docbook.sourceforge.net/release/xsl/current/COPYING
Source1: COPYING-docbook-xsl
Patch0: dblatex-0.2.7-external-which.patch
Patch1: dblatex-disable-debian.patch
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-which BuildRequires: python-which
@ -26,14 +30,14 @@ BuildRequires: texlive-collection-htmlxml
BuildRequires: transfig BuildRequires: transfig
BuildRequires: texlive-epstopdf-bin BuildRequires: texlive-epstopdf-bin
BuildRequires: texlive-xmltex-bin BuildRequires: texlive-xmltex-bin
BuildRequires: texlive-anysize BuildRequires: texlive-anysize
BuildRequires: texlive-appendix BuildRequires: texlive-appendix
BuildRequires: texlive-changebar BuildRequires: texlive-changebar
BuildRequires: texlive-jknapltx BuildRequires: texlive-jknapltx
BuildRequires: texlive-multirow BuildRequires: texlive-multirow
BuildRequires: texlive-overpic BuildRequires: texlive-overpic
BuildRequires: texlive-pdfpages BuildRequires: texlive-pdfpages
BuildRequires: texlive-subfigure BuildRequires: texlive-subfigure
BuildRequires: texlive-stmaryrd BuildRequires: texlive-stmaryrd
Requires: texlive-base Requires: texlive-base
Requires: texlive-collection-latex Requires: texlive-collection-latex
@ -41,24 +45,24 @@ Requires: texlive-collection-xetex
Requires: texlive-collection-htmlxml Requires: texlive-collection-htmlxml
Requires: texlive-collection-fontsrecommended Requires: texlive-collection-fontsrecommended
Requires: texlive-epstopdf-bin Requires: texlive-epstopdf-bin
Requires: texlive-passivetex Requires: texlive-passivetex
Requires: texlive-xmltex texlive-xmltex-bin Requires: texlive-xmltex texlive-xmltex-bin
Requires: texlive-anysize Requires: texlive-anysize
Requires: texlive-appendix Requires: texlive-appendix
Requires: texlive-bibtopic Requires: texlive-bibtopic
Requires: texlive-changebar Requires: texlive-changebar
Requires: texlive-ec Requires: texlive-ec
Requires: texlive-jknapltx Requires: texlive-jknapltx
Requires: texlive-multirow Requires: texlive-multirow
Requires: texlive-overpic Requires: texlive-overpic
Requires: texlive-passivetex Requires: texlive-passivetex
Requires: texlive-pdfpages Requires: texlive-pdfpages
Requires: texlive-subfigure Requires: texlive-subfigure
Requires: texlive-stmaryrd Requires: texlive-stmaryrd
Requires: texlive-xmltex-bin Requires: texlive-xmltex-bin
Requires: libxslt docbook-dtds Requires: libxslt docbook-dtds
Requires: transfig Requires: transfig
Requires: ImageMagick Requires: ImageMagick
%description %description
dblatex is a program that transforms your SGML/XMLDocBook dblatex is a program that transforms your SGML/XMLDocBook
@ -83,7 +87,6 @@ rm -rf lib/contrib
%install %install
rm -rf $RPM_BUILD_ROOT
#%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT #%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
%{__python} setup.py install --root $RPM_BUILD_ROOT %{__python} setup.py install --root $RPM_BUILD_ROOT
# these are already in tetex-latex: # these are already in tetex-latex:
@ -112,12 +115,7 @@ touch -r xsl/mathml2/README README-xsltml
cp -p %{SOURCE1} COPYING-docbook-xsl cp -p %{SOURCE1} COPYING-docbook-xsl
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-)
%{_mandir}/man1/dblatex.1* %{_mandir}/man1/dblatex.1*
%doc COPYRIGHT docs/manual.pdf COPYING-docbook-xsl README-xsltml %doc COPYRIGHT docs/manual.pdf COPYING-docbook-xsl README-xsltml
%{python_sitelib}/dbtexmf/ %{python_sitelib}/dbtexmf/
@ -132,6 +130,15 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /usr/bin/texhash %postun -p /usr/bin/texhash
%changelog %changelog
* Thu Aug 08 2013 Michael J Gruber <mjg@fedoraproject.org> - 0.3.4-8
- Merge in licensing changes from Stanislav Ochotnicky <sochotnicky@redhat.com>:
-* Mon Jul 29 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.3.4-8
-- Add Public Domain license and licensing comment
-* Mon Jul 29 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.3.4-7
-- Add DMIT, GPLv2 and LPPL licenses
-- Fix space and tab mixing
-- Cleanup old spec file parts
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-7 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@ -268,6 +275,3 @@ rm -rf $RPM_BUILD_ROOT
* Fri Sep 7 2007 Neal Becker <ndbecker2@gmail.com> - 0.2.7-1 * Fri Sep 7 2007 Neal Becker <ndbecker2@gmail.com> - 0.2.7-1
- Initial - Initial