rjones pushed to emacs-common-tuareg (master). "New upstream version 2.0.9. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Mar 28 19:27:51 UTC 2015
>From 4e05b9b64d9a6723d0b72b9b7319428ee670cf0d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sat, 28 Mar 2015 19:21:12 +0000
Subject: New upstream version 2.0.9.
- New upstream URL and source location (on github).
- Move the elisp source files into main package to comply with updated
packaging guidelines (https://fedoraproject.org/wiki/Packaging:Emacs).
- Update COPYING from upstream git.
- README -> README.md.
diff --git a/.gitignore b/.gitignore
index d73862b..b0991f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-tuareg-mode-1.45.6.tar.bz2
-/tuareg-2.0.4.tgz
-/tuareg-2.0.6.tar.gz
+/tuareg-*.tar.gz
diff --git a/COPYING b/COPYING
index d159169..ca1c544 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,13 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330
+ Boston, MA 02111-1307, USA.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +16,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
+the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -56,7 +57,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -255,7 +256,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +278,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -291,7 +292,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (C) 19yy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -303,16 +304,17 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -335,5 +337,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
+library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
diff --git a/emacs-common-tuareg.spec b/emacs-common-tuareg.spec
index a30dcba..60ddc6a 100644
--- a/emacs-common-tuareg.spec
+++ b/emacs-common-tuareg.spec
@@ -29,13 +29,13 @@
Name: emacs-common-%{pkg}
-Version: 2.0.6
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
Summary: Emacs and XEmacs mode for editing ocaml
License: GPLv2+
-URL: https://forge.ocamlcore.org/projects/tuareg/
-Source0: https://forge.ocamlcore.org/frs/download.php/882/tuareg-%{version}.tar.gz
+URL: https://github.com/ocaml/%{pkg}
+Source0: https://github.com/ocaml/%{pkg}/releases/download/%{version}/%{pkg}-%{version}.tar.gz
Source1: COPYING
BuildArch: noarch
@@ -62,6 +62,9 @@ the complete package.
Summary: Compiled elisp files to run %{pkgname} under GNU Emacs
Requires: emacs(bin) >= %{emacs_version}
Requires: emacs-common-%{pkg} = %{version}-%{release}
+# May be removed in Fedora 25.
+Obsoletes: emacs-%{pkg}-el <= %{version}-%{release}
+Provides: emacs-%{pkg}-el <= %{version}-%{release}
%description -n emacs-%{pkg}
Tuareg is an OCaml mode for GNU Emacs and XEmacs. It handles
@@ -72,21 +75,13 @@ interactive Caml toplevel and debbuger is provided.
Install this package if you need to edit OCaml code in Emacs.
-%package -n emacs-%{pkg}-el
-Summary: Elisp source files for %{pkgname} under GNU Emacs
-Requires: emacs-%{pkg} = %{version}-%{release}
-
-%description -n emacs-%{pkg}-el
-This package contains the elisp source files for %{pkgname} under GNU
-Emacs. You do not need to install this package to run
-%{pkgname}. Install the emacs-%{pkg} package to use %{pkgname} with
-GNU Emacs.
-
-
%package -n xemacs-%{pkg}
Summary: Compiled elisp files to run %{pkgname} under XEmacs
Requires: xemacs(bin) >= %{xemacs_version}
Requires: emacs-common-%{pkg} = %{version}-%{release}
+# May be removed in Fedora 25.
+Obsoletes: xemacs-%{pkg}-el <= %{version}-%{release}
+Provides: xemacs-%{pkg}-el <= %{version}-%{release}
%description -n xemacs-%{pkg}
Tuareg is an OCaml mode for GNU Emacs and XEmacs. It handles
@@ -97,17 +92,6 @@ interactive Caml toplevel and debbuger is provided.
Install this package if you need to edit OCaml code in XEmacs.
-%package -n xemacs-%{pkg}-el
-Summary: Elisp source files for %{pkgname} under XEmacs
-Requires: xemacs-%{pkg} = %{version}-%{release}
-
-%description -n xemacs-%{pkg}-el
-This package contains the elisp source files for %{pkgname} under
-XEmacs. You do not need to install this package to run
-%{pkgname}. Install the xemacs-%{pkg} package to use %{pkgname} with
-XEmacs.
-
-
%prep
%setup -q -n %{pkg}-%{version}
@@ -142,36 +126,36 @@ rm $RPM_BUILD_ROOT/%{xemacs_lispdir}/%{pkg}/tuareg-site-file.el
%files
-%doc COPYING README tuareg-site-file.el
+%doc COPYING README.md tuareg-site-file.el
%files -n emacs-%{pkg}
%doc COPYING
%{emacs_lispdir}/%{pkg}/*.elc
+%{emacs_lispdir}/%{pkg}/*.el
%{emacs_lispdir}/%{pkg}/version
#%{emacs_startdir}/*.el
%dir %{emacs_lispdir}/%{pkg}
-%files -n emacs-%{pkg}-el
-%doc COPYING
-%{emacs_lispdir}/%{pkg}/*.el
-
-
%files -n xemacs-%{pkg}
%doc COPYING
%{xemacs_lispdir}/%{pkg}/*.elc
+%{xemacs_lispdir}/%{pkg}/*.el
%{xemacs_lispdir}/%{pkg}/version
#%{xemacs_startdir}/*.el
%dir %{xemacs_lispdir}/%{pkg}
-%files -n xemacs-%{pkg}-el
-%doc COPYING
-%{xemacs_lispdir}/%{pkg}/*.el
-
-
%changelog
+* Sat Mar 28 2015 Richard W.M. Jones <rjones at redhat.com> - 2.0.9-1
+- New upstream version 2.0.9.
+- New upstream URL and source location (on github).
+- Move the elisp source files into main package to comply with updated
+ packaging guidelines (https://fedoraproject.org/wiki/Packaging:Emacs).
+- Update COPYING from upstream git.
+- README -> README.md.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index ad7f94d..f3c24e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60f294cb1367a65bea05ca4e79089adf tuareg-2.0.6.tar.gz
+142ed5dbefa2dbf4128aff3bdeed9f14 tuareg-2.0.9.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/emacs-common-tuareg.git/commit/?h=master&id=4e05b9b64d9a6723d0b72b9b7319428ee670cf0d
More information about the scm-commits
mailing list