!1 libart_lgpll: optimization the spec

Merge pull request !1 from orange-snn/init
This commit is contained in:
openeuler-ci-bot 2020-01-11 14:37:58 +08:00 committed by Gitee
commit ffb3b1bdb7
3 changed files with 8 additions and 56 deletions

View File

@ -1,14 +0,0 @@
#ifndef LIBART_MULTILIB
#define LIBART_MULTILIB
#include <bits/wordsize.h>
#if __WORDSIZE == 32
# include "art_config-32.h"
#elif __WORDSIZE == 64
# include "art_config-64.h"
#else
# error "unexpected value for __WORDSIZE macro"
#endif
#endif

View File

@ -1,33 +0,0 @@
--- libart_lgpl-2.3.17/libart-config.in.multilib 2006-07-27 18:02:06.000000000 -0400
+++ libart_lgpl-2.3.17/libart-config.in 2006-07-27 18:02:11.000000000 -0400
@@ -1,7 +1,9 @@
#!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+includedir=`pkg-config --variable includedir libart-2.0`
+libdir=`pkg-config --variable libdir libart-2.0`
+prefix=`pkg-config --variable prefix libart-2.0`
+exec_prefix=`pkg-config --variable exec_prefix libart-2.0`
exec_prefix_set=no
usage="\
@@ -36,15 +38,13 @@
echo $exec_prefix
;;
--version)
- echo @LIBART_VERSION@
+ pkg-config --modversion libart-2.0
;;
--cflags)
- includes=-I@includedir@/libart-2.0
- echo $includes
+ echo -I$includedir/libart-2.0
;;
--libs)
- libdirs=-L@libdir@
- echo $libdirs -lart_lgpl_2 -lm
+ echo -L$libdir -lart_lgpl_2 -lm
;;
*)
echo "${usage}" 1>&2

View File

@ -1,14 +1,11 @@
Name: libart_lgpl
Version: 2.3.21
Release: 22
Release: 23
Summary: A library for high-performance 2D graphics
License: LGPLv2+
URL: https://www.levien.com/libart/
Source0: https://download.gnome.org/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
Source1: art_config.h
#Patch0 comes from Fedora 29
Patch0: libart-multilib.patch
BuildRequires: gcc libtool pkgconfig automake autoconf
@ -37,10 +34,6 @@ autoreconf -i
%install
%make_install
pushd $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl
mv art_config.h art_config-%{__isa_bits}.h
cp %{SOURCE1} .
popd
%delete_la
%check
@ -67,7 +60,13 @@ make check
%doc README NEWS
%changelog
* Fri Sep 6 2019 openEuler Buildteam <buildteam@openeuler.org> -2.3.21-22
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.3.21-23
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: optimization the spec
* Fri Sep 6 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.21-22
- Type:enhancement
- ID:NA
- SUG:NA