From 6b61d169e2ab578b107e40ffe1555a459f2162a4 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 8 Jul 2010 06:52:24 +0000 Subject: [PATCH] - clear executable stack flag in xetex binary - fix cross-package symlink, move mf-nowin to texlive-utils - compile with -fno-strict-aliasing --- lgpl.txt | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++ texlive.spec | 25 +++++--- 2 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 lgpl.txt diff --git a/lgpl.txt b/lgpl.txt new file mode 100644 index 0000000..65c5ca8 --- /dev/null +++ b/lgpl.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/texlive.spec b/texlive.spec index 32cfb47..2762fee 100644 --- a/texlive.spec +++ b/texlive.spec @@ -21,7 +21,7 @@ Name: texlive Version: %{texlive_ver} -Release: 53%{?dist} +Release: 54%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -34,6 +34,8 @@ URL: http://tug.org/texlive/ #Source0: http://tug.org/svn/texlive/branches/branch2007/Master/source/source.tar.bz2 # non free source files removed with texlive-generate-tarball.sh Source0: source-free.tar.bz2 +# LGPL for kpathsea +Source1: http://www.gnu.org/licenses/lgpl.txt # Filter out bad requirements (RH bug #59819). Source99: texlive-filter-requires.sh @@ -141,7 +143,7 @@ BuildRequires: poppler-devel >= 0.6.2-2 BuildRequires: teckit-devel Requires: texlive-texmf = %{version} Requires: texlive-texmf-fonts = %{version} -Requires: texlive-texmf-errata = %{version} +Obsoletes: texlive-texmf-errata = %{version} # make sure fonts package installed before running post - since # fmtutil-sys is symlink to fmtutil Requires(post): %{_bindir}/fmtutil @@ -172,7 +174,7 @@ Group: Applications/Publishing Obsoletes: tetex-afm < 3.0-99 Provides: tetex-afm = 3.0-99 Requires: texlive-texmf-afm = %{version} -Requires: texlive-texmf-errata = %{version} +Obsoletes: texlive-texmf-errata = %{version} %description afm texlive-afm provides afm2tfm, a converter for PostScript(TM) font metric @@ -199,7 +201,7 @@ Provides: tetex-doc = 3.0-99 Obsoletes: texlive-doc < 2007-7 Provides: texlive-doc = %{version}-%{release} Requires: texlive-texmf-doc = %{version} -Requires: texlive-texmf-errata-doc = %{version} +Obsoletes: texlive-texmf-errata-doc = %{version} Requires: xdg-utils %description doc @@ -242,7 +244,7 @@ Obsoletes: tetex < 3.0-99 Obsoletes: tetex-dvips < 3.0-99 Provides: tetex-dvips = 3.0-99 Requires: texlive-texmf-dvips = %{version} -Requires: texlive-texmf-errata = %{version} +Obsoletes: texlive-texmf-errata = %{version} Provides: tex(dvips) Requires: psutils @@ -283,7 +285,7 @@ Obsoletes: tetex < 3.0-99 Obsoletes: tetex-latex < 3.0-99 Provides: tetex-latex = 3.0-99 Requires: texlive-texmf-latex = %{version} -Requires: texlive-texmf-errata = %{version} +Obsoletes: texlive-texmf-errata = %{version} Requires: texlive-utils = %{version}-%{release} Provides: tex(latex) @@ -302,7 +304,7 @@ Requires: texlive = %{version}-%{release} Requires: texlive-latex = %{version}-%{release} Requires: texlive-texmf-dvips = %{version} Requires: texlive-texmf-east-asian = %{version} -Requires: texlive-texmf-errata-east-asian = %{version} +Obsoletes: texlive-texmf-errata-east-asian = %{version} Requires: mendexk Obsoletes: texlive-japanese < 2007-20 Provides: texlive-japanese = %{version}-%{release} @@ -317,7 +319,7 @@ Summary: ConTeXt is a document preparation system based on TeX Group: Applications/Publishing Requires: texlive = %{version}-%{release} Requires: texlive-texmf-context = %{version} -Requires: texlive-texmf-errata-context = %{version} +Obsoletes: texlive-texmf-errata-context = %{version} Requires: ruby Provides: tex(context) @@ -612,6 +614,7 @@ rm -f %{buildroot}%{_texmf_main}/ls-R rm -rf __fedora_kpathsea mkdir -p __fedora_kpathsea/ mv %{buildroot}%{_texmf_main}/web2c/fmtutil.cnf __fedora_kpathsea/fmtutil.cnf-init +cp %{SOURCE1} __fedora_kpathsea/ # this file is different from the one in texmf-fonts, since it is # the one from kpathsea which isn't specific of texlive. It is only @@ -1168,7 +1171,7 @@ fi %files -n kpathsea %defattr(-,root,root,-) -%doc __fedora_kpathsea/kpathsea_defaults/ +%doc __fedora_kpathsea/kpathsea_defaults/ __fedora_kpathsea/lgpl.txt %{_libdir}/libkpathsea.so.* %{_infodir}/kpathsea.info.* @@ -1259,6 +1262,10 @@ fi %{_mandir}/man1/texutil.1* %changelog +* Thu Jul 08 2010 Jindrich Novy 2007-54 +- add LGPL license to kpathsea's docs +- obsolete *-errata packages, they were never really used + * Fri Jun 18 2010 Jindrich Novy 2007-53 - clear executable stack flag in xetex binary - fix cross-package symlink, move mf-nowin to texlive-utils