Transform the LLVM RPM spec file to be a configured file. This allows us

to automatically pick up the configured version number and other details.
Also, update the contents of this script to allow building both a source
and binary version of the RPM package.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29716 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 18 insertions, 80 deletions

diff --git a/llvm.spec b/llvm.spec
deleted file mode 100644
index 50d265a87e..0000000000
--- a/llvm.spec
+++ /dev/null
@@ -1,64 +0,0 @@
-Summary: Static and JIT research compiler infrastructure
-Name: llvm
-Version: 1.6cvs
-Release: 0
-License: U of Illinois/NCSA Open Source License
-Group: Development/Languages
-Source0: llvm.tar.gz
-URL: http://llvm.cs.uiuc.edu/releases/index.html
-#BuildRequires: llvm-gcc
-# (someday...)
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: /sbin/ldconfig
-
-%description
-LLVM is a compiler infrastructure designed for compile-time, link-time, runtime,
-and "idle-time" optimization of programs from arbitrary programming languages.
-LLVM is written in C++ and has been developed since 2000 at the University of
-Illinois. It currently supports compilation of C and C++ programs, using
-front-ends derived from GCC 3.4. The compiler infrastructure includes mirror
-sets of programming tools as well as libraries with equivalent
-functionality.
-
-%prep
-%setup -q -n llvm
-
-%build
-./configure \
---prefix=%{_prefix} \
---bindir=%{_bindir} \
---datadir=%{_datadir} \
---includedir=%{_includedir} \
---libdir=%{_libdir} \
---enable-optimized \
---enable-assertions \
-make
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-, root, root)
-%doc CREDITS.TXT LICENSE.TXT README.txt docs/*.{html,css,gif,jpg} docs/CommandGuide
-%{_bindir}/*
-%{_libdir}/*.o
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_includedir}/llvm
-
-%changelog
-* Fri Apr 07 2006 Reid Spencer
-- Make the build be optimized+assertions
-* Fri May 13 2005 Reid Spencer
-- Minor adjustments for the 1.5 release
-* Mon Feb 09 2003 Brian R. Gaeke
-- Initial working version of RPM spec file.
-
diff --git a/llvm.spec.in b/llvm.spec.in
index 50d265a87e..d1f53cb2e4 100644
--- a/llvm.spec.in
+++ b/llvm.spec.in
@@ -1,27 +1,27 @@
-Summary: Static and JIT research compiler infrastructure
-Name: llvm
-Version: 1.6cvs
+Name: @PACKAGE_NAME@
+Version: @PACKAGE_VERSION@
 Release: 0
-License: U of Illinois/NCSA Open Source License
-Group: Development/Languages
-Source0: llvm.tar.gz
-URL: http://llvm.cs.uiuc.edu/releases/index.html
-#BuildRequires: llvm-gcc
-# (someday...)
+Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
+License: University of Illinois/NCSA Open Source License
+Vendor: None (open source)
+Group: Development/Compilers
+URL: http://llvm..org/
+Source: http://llvm.org/releases/@PACKAGE_VERSION@/@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: /sbin/ldconfig
+BuildRequires: gcc >= 3.4
 
 %description
 LLVM is a compiler infrastructure designed for compile-time, link-time, runtime,
-and "idle-time" optimization of programs from arbitrary programming languages.
+and idle-time optimization of programs from arbitrary programming languages.
 LLVM is written in C++ and has been developed since 2000 at the University of
-Illinois. It currently supports compilation of C and C++ programs, using
-front-ends derived from GCC 3.4. The compiler infrastructure includes mirror
-sets of programming tools as well as libraries with equivalent
+Illinois and Apple.  It currently supports compilation of C and C++ programs, 
+using front-ends derived from GCC 3.4 and 4.0.2. The compiler infrastructure 
+includes mirror sets of programming tools as well as libraries with equivalent
 functionality.
 
 %prep
-%setup -q -n llvm
+%setup -q -n @PACKAGE_NAME@-@PACKAGE_VERSION@
 
 %build
 ./configure \
@@ -31,8 +31,8 @@ functionality.
 --includedir=%{_includedir} \
 --libdir=%{_libdir} \
 --enable-optimized \
---enable-assertions \
-make
+--enable-assertions 
+make tools-only
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +55,8 @@ rm -rf %{buildroot}
 %{_includedir}/llvm
 
 %changelog
+* Fri Aug 04 2006 Reid Spencer
+- Updates for release 1.8
 * Fri Apr 07 2006 Reid Spencer
 - Make the build be optimized+assertions
 * Fri May 13 2005 Reid Spencer