[common-lisp-controller/el6/master] - Fixed rhbz#642975: package creates /usr/lib64 on 32-bit system.

[green]

commit 33221b239923c7ac76dd47726b18afe143ae4b2d
Author: Anthony Green <green at moxielogic.com>
Date:   Sun Nov 14 00:30:25 2010 -0500

    - Fixed rhbz#642975: package creates /usr/lib64 on 32-bit system.

 common-lisp-controller-6.15-sbcl.patch     |   14 ----------
 common-lisp-controller-fedora.patch        |   16 ++++++------
 common-lisp-controller-special-chars.patch |   11 --------
 common-lisp-controller.spec                |   37 +++++++++++++++++----------
 sources                                    |    2 +-
 5 files changed, 32 insertions(+), 48 deletions(-)
---
diff --git a/common-lisp-controller-fedora.patch b/common-lisp-controller-fedora.patch
index 2ff3907..34a4e1f 100644
--- a/common-lisp-controller-fedora.patch
+++ b/common-lisp-controller-fedora.patch
@@ -1,15 +1,15 @@
---- common-lisp-controller.lisp~	2008-01-03 09:46:44.000000000 -0800
-+++ common-lisp-controller.lisp	2008-01-03 09:47:07.000000000 -0800
-@@ -60,7 +60,7 @@
+--- common-lisp-controller.lisp~	2010-07-30 20:29:24.000000000 -0400
++++ common-lisp-controller.lisp	2010-11-04 17:51:35.604803920 -0400
+@@ -46,7 +46,7 @@
    (setf *implementation-name* implementation-name)
    
    (pushnew :common-lisp-controller *features*)
--  (pushnew :clc-os-debian *features*)
-+  (pushnew :clc-os-fedora *features*)
+-  (pushnew :clc-os-debian *features*))
++  (pushnew :clc-os-fedora *features*))
  
-   ;; put the central registry at the *end*
-   ;; of the search list
-@@ -83,7 +83,7 @@
+ (defun compile-common-lisp-controller-v5 (implementation-name)
+   "Compiles the clc files. Returns a list of fasls
+@@ -54,7 +54,7 @@
    (setf *implementation-name* implementation-name)
  
    (pushnew :common-lisp-controller *features*)
diff --git a/common-lisp-controller.spec b/common-lisp-controller.spec
index 801e86f..efb59b7 100644
--- a/common-lisp-controller.spec
+++ b/common-lisp-controller.spec
@@ -1,12 +1,10 @@
 Summary:      Common Lisp source and compiler manager
 Name:         common-lisp-controller
-Version:      6.15
-Release:      9%{?dist}
+Version:      7.4
+Release:      2%{?dist}
 URL:          https://alioth.debian.org/projects/clc
 Source0:      http://ftp.de.debian.org/debian/pool/main/c/common-lisp-controller/common-lisp-controller_%{version}.tar.gz
 Patch0:       common-lisp-controller-fedora.patch
-Patch1:       common-lisp-controller-special-chars.patch
-Patch2:       common-lisp-controller-6.15-sbcl.patch
 License:      LLGPL
 Group:        Development/Libraries
 BuildArch:    noarch
@@ -19,12 +17,9 @@ It creates a user-specific cache of compiled objects. When a library
 or an implementation is upgraded, all compiled objects in the cache
 are flushed. It also provides tools to recompile all libraries.
 
-%prep
+%prep 
 %setup -q
 %patch0 -p0 
-%patch1 -p0 
-%patch2 -p1 -b .sbcl
-
 
 %build
 # Do nothing.
@@ -42,11 +37,12 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp/systems
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp/source
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/common-lisp-controller
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/common-lisp
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/common-lisp/bin
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/cache
 install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/cache/common-lisp-controller
+# Not %{_libdir} because we really want /usr/lib even on 64-bit systems.
+install -dm 755 $RPM_BUILD_ROOT/usr/lib/common-lisp
+install -dm 755 $RPM_BUILD_ROOT/usr/lib/common-lisp/bin
 
 for f in register-common-lisp-source unregister-common-lisp-source \
         register-common-lisp-implementation \
@@ -54,7 +50,8 @@ for f in register-common-lisp-source unregister-common-lisp-source \
         install -m 755 $f $RPM_BUILD_ROOT%{_sbindir};
 done;
 
-for f in clc-register-user-package clc-unregister-user-package; do
+for f in clc-register-user-package clc-unregister-user-package \
+         clc-clbuild clc-lisp clc-slime; do
         install -m 755 $f $RPM_BUILD_ROOT%{_bindir};
 done;
 
@@ -67,6 +64,9 @@ install -m 644 lisp-config.lisp -p -D $RPM_BUILD_ROOT%{_sysconfdir}/lisp-config.
 gzip man/*
 install -m 644 man/register-common-lisp-implementation.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 man/clc-register-user-package.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 man/clc-clbuild.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 man/clc-lisp.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 man/clc-slime.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1
 install -m 644 man/common-lisp-controller.3.gz $RPM_BUILD_ROOT/%{_mandir}/man3
 
 cd man
@@ -88,8 +88,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc DESIGN.txt debian/copyright
 %dir %{_sysconfdir}/common-lisp
-%dir %{_libdir}/common-lisp
-%dir %{_libdir}/common-lisp/bin
+%dir /usr/lib/common-lisp
+%dir /usr/lib/common-lisp/bin
 %dir %{_localstatedir}/cache/common-lisp-controller
 %config(noreplace) %{_sysconfdir}/lisp-config.lisp
 %{_datadir}/common-lisp
@@ -102,9 +102,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
-* Thu Feb 18 2010 Rex Dieter <rdieter at fedoraproject.org>  6.15-9
+* Tue Nov  9 2010 Anthony Green <green at redhat.com> 7.4-2
+- Fixed rhbz#642975: package creates /usr/lib64 on 32-bit system.
+
+* Thu Nov  4 2010 Anthony Green <green at redhat.com> 7.4-1
+- Upgrade.
+
+* Thu Feb 18 2010 Rex Dieter <rdieter at fedoraproject.org>  6.20-2
 - common-lisp-controller script problems (#499182)
 
+* Sun Dec 27 2009 Anthony Green <green at redhat.com> 6.20-1
+- Upgrade.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.15-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 1503dc3..2502805 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bf40df058333e43021db47ad2f8a332  common-lisp-controller_6.15.tar.gz
+f849501aa23099dd5c91e42e41544ab0  common-lisp-controller_7.4.tar.gz