llvm: fix BTS:2832

others: add Group tag

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9121 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnome-tweak-tool/gnome-tweak-tool-vl.spec

@@ -1,9 +1,10 @@
 Name:		gnome-tweak-tool
 Version:	3.14.2
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	A tool to customize advanced GNOME 3 options
 
 License:	GPLv3
+Group:		User Interface/Desktops
 URL:		http://live.gnome.org/GnomeTweakTool
 Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/3.14/%{name}-%{version}.tar.xz
 
@@ -90,6 +91,9 @@ fi
 
 
 %changelog
+* Sat Nov 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.2-2
+- add Group tag
+
 * Wed Nov 19 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.2-1
 - new upstream release
 

l/llvm/llvm-vl.spec

@@ -6,7 +6,7 @@
 
 Name:           llvm
 Version:        3.5.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        The Low Level Virtual Machine
 Summary(ja):    LLVM - 低レベルバーチャルマシン
 
@@ -28,9 +28,9 @@ Patch0:         llvm-2.6-timestamp.patch
 Patch21:        llvm-3.2-symbolic-shlib.patch
 
 # Vine Patch
-Patch1000: clang-3.1-driver-ld.gold.patch
+Patch1000: clang-3.5.0-driver-ld.gold.patch
-Patch1001: clang-3.1-driver-lib64.patch
+Patch1001: clang-3.5.0-driver-lib64.patch
-Patch1002: clang-3.3-driver-vine.patch
+Patch1002: clang-3.5.0-driver-vine.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -211,16 +211,17 @@ mv cfe-%{version}.src tools/clang
 # fix llvm-config --libs
 %patch21 -p1 -b .orig
 
-#%patch1000 -p1 -b .driver-ld.gold
+%patch1000 -p1 -b .driver-ld.gold
-#%ifarch x86_64
+%ifarch x86_64
-#%patch1001 -p1 -b .driver-lib64
+%patch1001 -p1 -b .driver-lib64
-#%endif
+%endif
-#%patch1002 -p1 -b .driver-vine
+%patch1002 -p1 -b .driver-vine
 
 # fix ld search path
 sed -i 's|/lib /usr/lib $lt_ld_extra|/%{_lib} %{_libdir} $lt_ld_extra|' \
     ./configure
-    
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config.in
+sed -i 's|/lib\>|/%{_lib}/%{name}|g' tools/llvm-config/llvm-config.cpp
 
 %build
 export CC=/usr/bin/gcc
@@ -250,19 +251,11 @@ export CXX=/usr/bin/g++
   --enable-libffi \
   --enable-shared \
   --enable-pic \
-  --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/%{gcc_version}/include) \
+  --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/*/include) \
   --with-binutils-include=%{_includedir} \
   --enable-targets=x86,powerpc,arm,aarch64,cpp,nvptx \
   --enable-experimental-targets=R600
   
-# FIXME file this
-# configure does not properly specify libdir
-sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
-
-# FIXME upstream need to fix this
-# llvm-config.cpp hardcodes lib in it
-sed -i 's|ActiveLibDir = ActivePrefix + "/lib"|ActiveLibDir = ActivePrefix + "/%{_lib}/%{name}"|g' tools/llvm-config/llvm-config.cpp
-
 make %{_smp_mflags} \
   REQUIRES_RTTI=1 \
   OPTIMIZE_OPTION="%{optflags}"
@@ -274,6 +267,9 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} \
      PROJ_docsdir=/moredocs
 
+# you have got to be kidding me
+rm -f %{buildroot}%{_bindir}/{FileCheck,count,not}
+
 # multilib fixes
 mv %{buildroot}%{_bindir}/llvm-config{,-%{__isa_bits}}
 
@@ -385,6 +381,7 @@ exit 0
 %{_bindir}/bugpoint
 %{_bindir}/llc
 %{_bindir}/lli
+%{_bindir}/lli-child-target
 %exclude %{_bindir}/llvm-config-%{__isa_bits}
 %{_bindir}/llvm*
 %{_bindir}/macho-dump
@@ -464,6 +461,13 @@ exit 0
 
 
 %changelog
+* Sat Nov 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.0-2
+- fix <BTS:2832>
+  - fix configure option "--with-c-include-dirs"
+  - update Patch1000: clang-3.5.0-driver-ld.gold.patch
+  - update Patch1001: clang-3.5.0-driver-lib64.patch
+  - update Patch1002: clang-3.5.0-driver-vine.patch
+
 * Tue Oct 28 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.0-1
 - update to 3.5.0
 - remove Patch11 (clang-hardfloat-hack.patch)

w/webkitgtk4/webkitgtk4-vl.spec

@@ -7,10 +7,11 @@
 
 Name:           webkitgtk4
 Version:        2.6.4
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        GTK+ Web content engine library
 
 License:        LGPLv2
+Group:			Development/Libraries
 URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
@@ -68,6 +69,7 @@ This package contains WebKitGTK+ for GTK+ 3.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:			Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
@@ -162,6 +164,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
 
 %changelog
+* Sat Nov 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.4-2
+- add Group tag
+
 * Mon Nov 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.4-1
 - new upstream release