diff --git a/libXfont2-2.0.5-sw.patch b/libXfont2-2.0.5-sw.patch deleted file mode 100755 index ba975678ad21079e8b50988055e803a6f3c88300..0000000000000000000000000000000000000000 --- a/libXfont2-2.0.5-sw.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur libXfont2-2.0.5.org/src/util/fontxlfd.c libXfont2-2.0.5.sw/src/util/fontxlfd.c ---- libXfont2-2.0.5.org/src/util/fontxlfd.c 2022-02-26 07:10:25.040000000 +0000 -+++ libXfont2-2.0.5.sw/src/util/fontxlfd.c 2022-02-26 07:11:03.520000000 +0000 -@@ -197,6 +197,7 @@ - #if defined(i386) || defined(__i386__) || \ - defined(ia64) || defined(__ia64__) || \ - defined(__alpha__) || defined(__alpha) || \ -+ defined(__sw_64__) || defined(__sw_64) || \ - defined(__hppa__) || \ - defined(__amd64__) || defined(__amd64) || \ - defined(sgi) diff --git a/libXfont2-2.0.6.tar.gz b/libXfont2-2.0.6.tar.gz deleted file mode 100644 index d0287d6de569bedf951f58a99c10a37d0c8a3d8b..0000000000000000000000000000000000000000 Binary files a/libXfont2-2.0.6.tar.gz and /dev/null differ diff --git a/libXfont2-2.0.7.tar.xz b/libXfont2-2.0.7.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..6deeb429465cfda30fcc885b4ab92093c8564e06 Binary files /dev/null and b/libXfont2-2.0.7.tar.xz differ diff --git a/libXfont2.spec b/libXfont2.spec index 1762b8b8942e10ea0e1bd1f8df33bb5eb54ffc28..7d8c47ede0050daa1a521a0f959a63ce563bb590 100644 --- a/libXfont2.spec +++ b/libXfont2.spec @@ -1,16 +1,19 @@ Name: libXfont2 -Version: 2.0.6 +Version: 2.0.7 Release: 1 Summary: X.Org X11 libXfont2 runtime library -License: MIT -URL: https://xorg.freedesktop.org/ -Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.gz -%ifarch sw_64 -Patch1: libXfont2-2.0.5-sw.patch -%endif - -BuildRequires: autoconf automake libtool pkgconfig(fontsproto) freetype-devel -BuildRequires: xorg-x11-util-macros libfontenc-devel xorg-x11-xtrans-devel +License: BSD-2-Clause AND BSD-4-Clause-UC AND HPND-sell-variant AND MIT-open-group AND SMLNJ AND X11BSD-2-Clause AND BSD-4-Clause-UC AND HPND-sell-variant AND MIT-open-group AND SMLNJ AND X11 +URL: https://www.x.org/ +Source0: https://www.x.org/releases/individual/lib/%{name}-%{version}.tar.xz + +BuildRequires: gcc make +BuildRequires: pkgconfig(fontenc) +BuildRequires: pkgconfig(fontsproto) >= 2.1.3 +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(xorg-macros) >= 1.10 +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xtrans) +BuildRequires: pkgconfig(zlib) %description libXfont provides the core of the legacy X11 font system, handling @@ -20,7 +23,7 @@ library. %package devel Summary: Development files and Header files for %{name} -Requires: %{name} = %{version}-%{release} libfontenc-devel +Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -32,37 +35,30 @@ developing applications that use %{name}. %autosetup -n %{name}-%{version} -p1 %build -autoreconf -ivf -export CFLAGS="$RPM_OPT_FLAGS -Os" -%configure +%configure --disable-static %make_build %install %make_install %delete_la -%ldconfig_scriptlets - %files -%defattr(-,root,root) %doc AUTHORS ChangeLog %license COPYING %{_libdir}/libXfont2.so.* - %files devel -%defattr(-,root,root) %{_includedir}/X11/fonts/libxfont2.h %{_libdir}/pkgconfig/*.pc -%{_libdir}/*.a %{_libdir}/libXfont2.so - %files help -%defattr(-,root,root) %doc README.md %changelog +* Sat Aug 03 2024 Funda Wang - 2.0.7-1 +- update to 2.0.7 + * Fri Feb 03 2023 zhouwenpei - 2.0.6-1 - update to 2.0.6