diff --git a/libpciaccess-0.16.tar.bz2 b/libpciaccess-0.16.tar.bz2 deleted file mode 100644 index f6cc13dfeec1b9c28ff134018d27ca63f5e5822c..0000000000000000000000000000000000000000 Binary files a/libpciaccess-0.16.tar.bz2 and /dev/null differ diff --git a/libpciaccess-0.17.tar.xz b/libpciaccess-0.17.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d7998d1edd12352de62bcbae43bebb41fb3d9e79 Binary files /dev/null and b/libpciaccess-0.17.tar.xz differ diff --git a/libpciaccess.spec b/libpciaccess.spec index 8a0e09081418742b3431b8830659729bc4a2e9cc..7c17742c73353d8c9731f689f65d7df25ca27468 100644 --- a/libpciaccess.spec +++ b/libpciaccess.spec @@ -1,18 +1,15 @@ -%define anolis_release 2 +%define anolis_release 1 Name: libpciaccess -Version: 0.16 +Version: 0.17 Release: %{anolis_release}%{?dist} Summary: PCI access library License: MIT URL: https://www.x.org/ -Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2 -Source1: make-libpciaccess-snapshot.sh +Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.xz - -BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros -BuildRequires: make +BuildRequires: meson >= 0.48.0 Requires: hwdata %description @@ -30,7 +27,6 @@ The %{name}-doc package contains documentation files for %{name}. %package devel Summary: PCI access library development package Requires: %{name} = %{version}-%{release} -Requires: pkgconfig %description devel Development package for libpciaccess. @@ -39,20 +35,15 @@ Development package for libpciaccess. %autosetup -p1 %build -autoreconf -v --install -%configure --disable-static -%make_build +%meson -Dzlib=disabled +%meson_build %install -%make_install -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - -%ldconfig_scriptlets +%meson_install %files %license COPYING -%{_libdir}/libpciaccess.so.0 -%{_libdir}/libpciaccess.so.0.11.* +%{_libdir}/libpciaccess.so.* %files doc %doc AUTHORS @@ -63,6 +54,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %{_libdir}/pkgconfig/pciaccess.pc %changelog +* Fri Nov 18 2022 Funda Wang - 0.17-1 +- New version 0.17 + * Fri Sep 30 2022 mgb01105731 - 0.16-2 - add doc package diff --git a/make-libpciaccess-snapshot.sh b/make-libpciaccess-snapshot.sh deleted file mode 100755 index a265c3f97fdc3e8b08f362cd3cc7e1efa057326b..0000000000000000000000000000000000000000 --- a/make-libpciaccess-snapshot.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -DATE=$( date +%Y%m%d ) -DIRNAME=libpciaccess -REV=${1:-master} - -if test -e $DIRNAME.git; then - GIT_DIR=$DIRNAME.git git fetch git://git.freedesktop.org/git/xorg/lib/libpciaccess -else - git clone --bare git://git.freedesktop.org/git/xorg/lib/libpciaccess $DIRNAME.git - GIT_DIR=$DIRNAME.git git archive --prefix=$DIRNAME-$DATE/ --format=tar $REV | \ - bzip2 -c > $DIRNAME-$DATE.tar.bz2 -fi - -HASH=$(GIT_DIR=$DIRNAME.git git show-ref -s $REV) - -echo $HASH - -exit - -# the rest of this is supposed to work? i guess. - -version=$(sed -n -e "s/^Version: *\(.*\)/\1/p" < libpciaccess.spec) -release=$(sed -n -e "s/^Release: *\([^.]*\).*/\1/p" < libpciaccess.spec) -release=$(($release + 1)) - -user=$(id -un) -IFS=: info=($(grep ^$user: /etc/passwd)) - -msg="* $(date +'%a %b %d %Y') ${info[4]} <$user@redhat.com> $version-$release.$DATE\\ -- New snapshot, git revision $HASH.\\ -" - -sed -i -e "s/^%define gitdate.*/%define gitdate $DATE/" \ - -e "s/^%define gitrev.*/%define gitrev $HASH/" \ - -e "s/^Source0:.*/Source0: $DIRNAME-$DATE.tar.bz2/" \ - -e "s/^Release:.*/Release: $release.%{gitdate}%{?dist}/" \ - -e "/%changelog/ a $msg" \ - libpciaccess.spec - -make new-sources FILES=$DIRNAME-$DATE.tar.bz2