From e0ee08d58d3de3f88937347cc6d09ab679a0ce9ed06cb8b92441b176a6285682 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 31 Mar 2021 20:47:45 +0000 Subject: [PATCH 1/2] - Update to version 1.2.1 * Update README for gitlab migration * Update configure.ac bug URL for gitlab migration * Note ABI of XResQueryClientIds * XRes: Use _XRead instead of _XRead32 for reading pid OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXres?expand=0&rev=16 --- libXres-1.2.0.tar.bz2 | 3 --- libXres-1.2.1.tar.bz2 | 3 +++ libXres.changes | 9 +++++++++ libXres.spec | 8 ++++---- 4 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 libXres-1.2.0.tar.bz2 create mode 100644 libXres-1.2.1.tar.bz2 diff --git a/libXres-1.2.0.tar.bz2 b/libXres-1.2.0.tar.bz2 deleted file mode 100644 index 352721a..0000000 --- a/libXres-1.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4 -size 286635 diff --git a/libXres-1.2.1.tar.bz2 b/libXres-1.2.1.tar.bz2 new file mode 100644 index 0000000..2f108de --- /dev/null +++ b/libXres-1.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11 +size 311025 diff --git a/libXres.changes b/libXres.changes index f113c2d..a80a0e6 100644 --- a/libXres.changes +++ b/libXres.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 31 20:44:50 UTC 2021 - Stefan Dirsch + +- Update to version 1.2.1 + * Update README for gitlab migration + * Update configure.ac bug URL for gitlab migration + * Note ABI of XResQueryClientIds + * XRes: Use _XRead instead of _XRead32 for reading pid + ------------------------------------------------------------------- Thu Oct 12 17:39:36 UTC 2017 - sndirsch@suse.com diff --git a/libXres.spec b/libXres.spec index 3f3d407..72436fa 100644 --- a/libXres.spec +++ b/libXres.spec @@ -1,7 +1,7 @@ # # spec file for package libXres # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libXres %define lname libXRes1 -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: X Resource extension client library License: MIT Group: Development/Libraries/C and C++ -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXRes #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXRes/ From bd3eb7ab8d6711d0e43acd79d94fb7db668de0acb47caa63f5f80467d6916d30 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 6 Apr 2021 08:21:12 +0000 Subject: [PATCH 2/2] Accepting request 883117 from home:dirkmueller:Factory - modernize spec file (move license to licensedir) OBS-URL: https://build.opensuse.org/request/show/883117 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXres?expand=0&rev=17 --- libXres.changes | 5 +++++ libXres.spec | 44 +++++++++++++++++++------------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/libXres.changes b/libXres.changes index a80a0e6..4db9183 100644 --- a/libXres.changes +++ b/libXres.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 6 02:03:23 UTC 2021 - Dirk Müller + +- modernize spec file (move license to licensedir) + ------------------------------------------------------------------- Wed Mar 31 20:44:50 UTC 2021 - Stefan Dirsch diff --git a/libXres.spec b/libXres.spec index 72436fa..f48cab3 100644 --- a/libXres.spec +++ b/libXres.spec @@ -16,21 +16,18 @@ # -Name: libXres %define lname libXRes1 +Name: libXres Version: 1.2.1 Release: 0 Summary: X Resource extension client library License: MIT Group: Development/Libraries/C and C++ -URL: http://xorg.freedesktop.org/ - +URL: https://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXRes #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXRes/ -Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 +Source: https://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(resourceproto) >= 1.0 BuildRequires: pkgconfig(x11) @@ -44,11 +41,11 @@ extension to the X protocol. The Resource extension allows for X clients to see and monitor the X resource usage of various clients (pixmaps, et al). -%package -n %lname +%package -n %{lname} Summary: X Resource extension client library Group: System/Libraries -%description -n %lname +%description -n %{lname} libXRes provides an X Window System client interface to the Resource extension to the X protocol. The Resource extension allows for X clients to see and monitor the X resource usage of various clients @@ -57,7 +54,7 @@ clients to see and monitor the X resource usage of various clients %package devel Summary: Development files for the X Resource extension library Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel libXRes provides an X Window System client interface to the Resource @@ -66,33 +63,30 @@ clients to see and monitor the X resource usage of various clients (pixmaps, et al). This package contains the development headers for the library found -in %lname. +in %{lname}. %prep %setup -q %build %configure --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR="%buildroot" -rm -f "%buildroot/%_libdir"/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig - -%files -n %lname -%defattr(-,root,root) -%doc COPYING -%_libdir/libXRes.so.1* +%files -n %{lname} +%license COPYING +%{_libdir}/libXRes.so.1* %files devel -%defattr(-,root,root) -%_includedir/X11/* -%_libdir/libXRes.so -%_libdir/pkgconfig/xres.pc -%_mandir/man3/* +%{_includedir}/X11/* +%{_libdir}/libXRes.so +%{_libdir}/pkgconfig/xres.pc +%{_mandir}/man3/* %changelog