merge of '88a10aef497b4d73573c8a8981585e16f0995e48'

and 'cc3363411e1fef4146716205399097481c5262c9'

aria2/aria2.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Web
 License:      GPL
-Version:      1.9.1
-Release:      20100415
+Version:      1.9.2
+Release:      20100429
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/aria2/aria2-%{version}.tar.bz2

cherokee/cherokee.spec

@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_major 0.99
-%define       V_minor 47
+%define       V_minor 48
 
 #   package information
 Name:         cherokee
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Web
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20100428
+Release:      20100429
 
 #   package options
 %option       with_ssl     no

llvm/llvm.patch

@@ -1,21 +1,22 @@
-Index: autoconf/ExportMap.map
---- autoconf/ExportMap.map.orig	2009-02-26 19:37:59 +0100
-+++ autoconf/ExportMap.map	2010-01-23 10:15:28 +0100
-@@ -1,4 +1,4 @@
- {
--	global: main;
-+	global: main; environ; __progname;
- 	local: *;
- };
 Index: Makefile.config.in
---- Makefile.config.in.orig	2009-08-18 02:40:33 +0200
-+++ Makefile.config.in	2010-01-23 13:51:58 +0100
+--- Makefile.config.in.orig	2010-03-04 21:56:19.000000000 +0100
++++ Makefile.config.in	2010-04-29 20:19:26.000000000 +0200
 @@ -83,7 +83,7 @@
- PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
- PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
- PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
--PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
-+PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/man
+ PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
+ PROJ_includedir := $(PROJ_prefix)/include
+ PROJ_infodir    := $(PROJ_prefix)/info
+-PROJ_mandir     := $(PROJ_prefix)/share/man
++PROJ_mandir     := $(PROJ_prefix)/man
  
  # Determine if we're on a unix type operating system
  LLVM_ON_UNIX:=@LLVM_ON_UNIX@
+Index: autoconf/ExportMap.map
+--- autoconf/ExportMap.map.orig	2010-02-24 23:33:41.000000000 +0100
++++ autoconf/ExportMap.map	2010-04-29 19:44:53.000000000 +0200
+@@ -1,5 +1,5 @@
+ {
+-	global: main;
++	global: main; environ; __progname;
+ 		__progname;
+ 		environ;
+ 

llvm/llvm.spec

@@ -31,12 +31,12 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Compiler
 License:      University of Illinois Open Source License
-Version:      2.6
-Release:      20100123
+Version:      2.7
+Release:      20100430
 
 #   list of sources
-Source0:      http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
-Source1:      http://llvm.org/releases/%{version}/clang-%{version}.tar.gz
+Source0:      http://llvm.org/releases/%{version}/llvm-%{version}.tgz
+Source1:      http://llvm.org/releases/%{version}/clang-%{version}.tgz
 Patch0:       llvm.patch
 
 #   build information
@@ -63,7 +63,7 @@ PreReq:       OpenPKG, openpkg >= 20100101
     prog llvm = {
         version   = %{version}
         url       = http://llvm.org/releases/download.html
-        regex     = llvm-(__VER__)\.tar\.gz
+        regex     = llvm-(__VER__)\.(?:tar\.gz|tgz)
     }
 
 %prep