Merge branch 'licensing'

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

View File

@ -2,18 +2,22 @@
Name: dblatex
Version: 0.3.4
Release: 7%{?dist}
Release: 8%{?dist}
Summary: DocBook to LaTeX/ConTeXt Publishing
BuildArch: noarch
Group: Applications/Publishing
License: GPLv2+
# Most of package is GPLv2+, except:
# xsl/ directory is DMIT
# lib/dbtexmf/core/sgmlent.txt is Public Domain
# latex/misc/enumitem.sty, multirow2.sry and ragged2e.sty are LPPL
# latex/misc/lastpage.sty is GPLv2 (no +)
# latex/misc/passivetex is MIT (not included in binary RPM so not listed)
License: GPLv2+ and GPLv2 and LPPL and DMIT and Public Domain
URL: http://dblatex.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
#Source1: http://docbook.sourceforge.net/release/xsl/current/COPYING
# 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: python-which
@ -83,7 +87,6 @@ rm -rf lib/contrib
%install
rm -rf $RPM_BUILD_ROOT
#%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
%{__python} setup.py install --root $RPM_BUILD_ROOT
# these are already in tetex-latex:
@ -112,12 +115,7 @@ touch -r xsl/mathml2/README README-xsltml
cp -p %{SOURCE1} COPYING-docbook-xsl
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_mandir}/man1/dblatex.1*
%doc COPYRIGHT docs/manual.pdf COPYING-docbook-xsl README-xsltml
%{python_sitelib}/dbtexmf/
@ -132,6 +130,15 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /usr/bin/texhash
%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
- 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
- Initial