[xemacs-packages-extra] Update to new package release. Drop BuildRoot. Drop xz BR; it is on the exceptions list. Add -risky

Jerry James jjames at fedoraproject.org
Tue Jan 8 21:45:14 UTC 2013


commit 6cbf831e6d8056d5b75290329922203ea9701480
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Tue Jan 8 14:44:53 2013 -0700

    Update to new package release.
    Drop BuildRoot.
    Drop xz BR; it is on the exceptions list.
    Add -risky patch to fix build.

 .gitignore                                 |    2 +-
 sources                                    |    2 +-
 xemacs-packages-extra-20121228-risky.patch |   12 ++++++++++++
 xemacs-packages-extra.spec                 |   16 +++++++++++-----
 4 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3aafb46..d9c04a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xemacs-packages-extra-20110502.tar.xz
+/xemacs-packages-extra-20121228.tar.xz
diff --git a/sources b/sources
index f62b894..331c8db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a4bbf5a28671f883ecba883c2df01d3  xemacs-packages-extra-20110502.tar.xz
+4f2e571e3893e9bead3b4af0ce3ca3f1  xemacs-packages-extra-20121228.tar.xz
diff --git a/xemacs-packages-extra-20121228-risky.patch b/xemacs-packages-extra-20121228-risky.patch
new file mode 100644
index 0000000..f1a1a94
--- /dev/null
+++ b/xemacs-packages-extra-20121228-risky.patch
@@ -0,0 +1,12 @@
+--- xemacs-packages-extra-20121228/xemacs-packages/ede/ede.el~	2012-01-25 09:29:15.000000000 -0700
++++ xemacs-packages-extra-20121228/xemacs-packages/ede/ede.el	2013-01-08 14:19:35.186169078 -0700
+@@ -113,8 +113,7 @@ Any other value disables searching for E
+   :type '(choice (const :tag "Any directory" t)
+ 		 (repeat :tag "List of directories" (directory))
+ 		 (function :tag "Predicate"))
+-  :version "23.4"
+-  :risky t)
++  :version "23.4")
+ 
+ (defun ede-directory-safe-p (dir)
+   "Return non-nil if DIR is a safe directory to load projects from.
diff --git a/xemacs-packages-extra.spec b/xemacs-packages-extra.spec
index 0741abe..fa6e653 100644
--- a/xemacs-packages-extra.spec
+++ b/xemacs-packages-extra.spec
@@ -2,8 +2,8 @@
 %global xemver  %(pkg-config --modversion xemacs 2>/dev/null || echo 0)
 
 Name:           xemacs-packages-extra
-Version:        20110502
-Release:        4%{?dist}
+Version:        20121228
+Release:        1%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -35,7 +35,8 @@ Patch4:         %{name}-20090217-auctex-cvs-keywords.patch
 Patch5:         %{name}-20090217-auctex-texjp-platex.patch
 # update browsers in psgml-html
 Patch6:         %{name}-20090217-browsers.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# do not use the unsupported :risky keyword to defcustom
+Patch7:         %{name}-20121228-risky.patch
 
 BuildArch:      noarch
 BuildRequires:  xemacs >= 21.5.29-11
@@ -45,8 +46,6 @@ BuildRequires:  tex(latex)
 BuildRequires:  info
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
-# xz for unpacking Source0
-BuildRequires:  xz
 Requires:       xemacs-packages-base = %{version}
 Requires:       xemacs(bin) >= %{xemver}
 # Fake release here for historical reasons
@@ -94,6 +93,7 @@ collection in GNU texinfo format
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 chmod -c -x \
     xemacs-packages/auctex/style/babel.el \
@@ -222,6 +222,12 @@ sed -i -e 's/^\(.*[_-]ja\.info.*\)$/%lang(ja) \1/' info-files
 
 
 %changelog
+* Tue Jan  8 2013 Jerry James <loganjerry at gmail.com> - 20121228-1
+- Update to new package release
+- Drop BuildRoot
+- Drop xz BR; it is on the exceptions list
+- Add -risky patch to fix build
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20110502-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list