From 310e3a728f328d8ceb07db30f1a145a18b572be0 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 19:21:30 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/libIDL-config-2.in b/libIDL-config-2.in index 8c1b4ff..35b2bc6 100644 --- a/libIDL-config-2.in +++ b/libIDL-config-2.in @@ -1,11 +1,8 @@ #! /bin/sh -name=libIDL-2.0 -prefix=`pkg-config --variable prefix $name` -exec_prefix=`pkg-config --variable exec_prefix $name` +prefix=@prefix@ +exec_prefix=@exec_prefix@ exec_prefix_set=no -includedir=`pkg-config --variable includedir $name` -libdir=`pkg-config --variable libdir $name` usage() { @@ -49,11 +46,11 @@ while test $# -gt 0; do echo_exec_prefix=yes ;; --version) - pkg-config --modversion $name + echo @LIBIDL_VERSION@ exit 0 ;; --cflags) - includes="-I$includedir/libIDL-2.0" + includes="-I@includedir@/libIDL-2.0" echo_cflags=yes ;; --libs) @@ -78,7 +75,7 @@ if test "$echo_cflags" = "yes"; then all_flags="$all_flags $includes $cflags `pkg-config --cflags glib-2.0`" fi if test "$echo_libs" = "yes"; then - all_flags="$all_flags -L$libdir -lIDL-2 `pkg-config --libs glib-2.0`" + all_flags="$all_flags -L@libdir@ -lIDL-2 `pkg-config --libs glib-2.0`" fi # Straight out any possible duplicates, but be careful to diff --git a/libIDL-config-2.in.multilib b/libIDL-config-2.in.multilib deleted file mode 100644 index 35b2bc6..0000000 --- a/libIDL-config-2.in.multilib +++ /dev/null @@ -1,107 +0,0 @@ -#! /bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - -usage() -{ - cat <&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo @LIBIDL_VERSION@ - exit 0 - ;; - --cflags) - includes="-I@includedir@/libIDL-2.0" - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -all_flags= - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi -if test "$echo_cflags" = "yes"; then - all_flags="$all_flags $includes $cflags `pkg-config --cflags glib-2.0`" -fi -if test "$echo_libs" = "yes"; then - all_flags="$all_flags -L@libdir@ -lIDL-2 `pkg-config --libs glib-2.0`" -fi - -# Straight out any possible duplicates, but be careful to -# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz' -other_flags= -rev_libs= -for i in $all_flags; do - case "$i" in - # a library, save it for later, in reverse order - -l*) rev_libs="$i $rev_libs" ;; - *) - case " $other_flags " in - *\ $i\ *) ;; # already there - *) other_flags="$other_flags $i" ;; # add it to output - esac ;; - esac -done - -ord_libs= -for i in $rev_libs; do - case " $ord_libs " in - *\ $i\ *) ;; # already there - *) ord_libs="$i $ord_libs" ;; # add it to output in reverse order - esac -done - -echo $other_flags $ord_libs - -exit 0