From 37949d172b28ecfe37ef02c63a3a3d30c2379629 Mon Sep 17 00:00:00 2001
From: amrein <amrein@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 8 Jan 2017 19:23:11 +0000
Subject: [PATCH] Remove bzip2 in pkg-config invocation for more compatibility
 (new snapshot will compile in Centos)

git-svn-id: svn://ultimatepp.org/upp/trunk@10679 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/Scripts/upp-devel.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/uppbox/Scripts/upp-devel.spec b/uppbox/Scripts/upp-devel.spec
index 5f54803cd..9b39f6fe7 100644
--- a/uppbox/Scripts/upp-devel.spec
+++ b/uppbox/Scripts/upp-devel.spec
@@ -105,8 +105,8 @@ to C++ programming. It provides:
 # ----
 %build
 
-sed -e "s@-I((INCLUDES))@$(pkg-config --cflags-only-I gtk+-2.0 libnotify bzip2 x11)@g" uppsrc/Makefile.in > uppsrc/Makefile
-sed -e "s@-I((INCLUDES))@$(pkg-config --cflags-only-I gtk+-2.0 libnotify bzip2 x11)@g" uppsrc/uMakefile.in > uppsrc/uMakefile
+sed -e "s@-I((INCLUDES))@$(pkg-config --cflags-only-I gtk+-2.0 libnotify x11)@g" uppsrc/Makefile.in > uppsrc/Makefile
+sed -e "s@-I((INCLUDES))@$(pkg-config --cflags-only-I gtk+-2.0 libnotify x11)@g" uppsrc/uMakefile.in > uppsrc/uMakefile
 
 if [ ! -f /usr/lib/libdl.so -a ! -f /usr/lib64/libdl.so ]
 then
@@ -117,8 +117,8 @@ fi
 make %{?_smp_mflags} \
      -C uppsrc \
      -f Makefile \
-     -e LIBPATH=$(pkg-config --libs-only-L gtk+-2.0 libnotify bzip2 x11) \
-     -e CINC=" -I. $(pkg-config --cflags gtk+-2.0 libnotify bzip2 x11)"  \
+     -e LIBPATH=$(pkg-config --libs-only-L gtk+-2.0 libnotify x11) \
+     -e CINC=" -I. $(pkg-config --cflags gtk+-2.0 libnotify x11)"  \
      -e UPPOUT="$PWD/out/" \
      -e OutFile="$PWD/out/ide.out" \
 %if ! 0%{?fedora_version}
@@ -129,8 +129,8 @@ make %{?_smp_mflags} \
 make %{?_smp_mflags} \
      -C uppsrc \
      -f uMakefile \
-     -e LIBPATH=$(pkg-config --libs-only-L gtk+-2.0 libnotify bzip2 x11) \
-     -e CINC=" -I. $(pkg-config --cflags gtk+-2.0 libnotify bzip2 x11)"  \
+     -e LIBPATH=$(pkg-config --libs-only-L gtk+-2.0 libnotify x11) \
+     -e CINC=" -I. $(pkg-config --cflags gtk+-2.0 libnotify x11)"  \
      -e UPPOUT="$PWD/out/" \
      -e OutFile="$PWD/out/umk.out" \
 %if ! 0%{?fedora_version}
@@ -171,8 +171,8 @@ cp -p *.scd %{buildroot}/%{_datadir}/%{project_name}/
 # We create our own GCC.bm
 # cp -p uppsrc/ide/GCC.bm %{buildroot}/%{_datadir}/%{project_name}/
 
-INCLUDEDIR=$( pkg-config --cflags gtk+-2.0 libnotify bzip2 x11 | awk ' { gsub ( /-pthread /, "" ) ; gsub ( / /, "" ) ; gsub ( /-I/, ";" ) ; sub ( /;/, "" ) ; print $0 }' )
-LIBDIR=$( pkg-config --libs-only-L gtk+-2.0 libnotify bzip2 x11 | awk ' { gsub ( / /, "" ) ; gsub ( /-I/, ";" ) ; sub ( /;/, "" ) ; print $0 }' )
+INCLUDEDIR=$( pkg-config --cflags gtk+-2.0 libnotify x11 | awk ' { gsub ( /-pthread /, "" ) ; gsub ( / /, "" ) ; gsub ( /-I/, ";" ) ; sub ( /;/, "" ) ; print $0 }' )
+LIBDIR=$( pkg-config --libs-only-L gtk+-2.0 libnotify x11 | awk ' { gsub ( / /, "" ) ; gsub ( /-I/, ";" ) ; sub ( /;/, "" ) ; print $0 }' )
 
 %if 0%{?fedora_version}
      LINK="$(pkg-config --libs libpng freetype2)"