From e84895788374f9a6574600ba88ba6ba571c93682ddb4aa0080c4265c4981a94d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 27 Apr 2014 22:07:07 +0000 Subject: [PATCH 1/3] Obsoletes: xorg-x11-proto-devel -> Provides: xorg-x11-proto-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libxkbui?expand=0&rev=11 --- libxkbui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxkbui.spec b/libxkbui.spec index 7733980..2a66ad0 100644 --- a/libxkbui.spec +++ b/libxkbui.spec @@ -1,7 +1,7 @@ # # spec file for package libxkbui # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 0fb24c8fb2f7646528199fa1d2357b42fea957648231d1da7ce9f0676ffdfa72 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 25 Apr 2023 21:43:30 +0000 Subject: [PATCH 2/3] Accepting request 1082778 from home:fcrozat:branches:X11:XOrg - Add baselibs.conf as source to specfile. OBS-URL: https://build.opensuse.org/request/show/1082778 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libxkbui?expand=0&rev=12 --- libxkbui.changes | 5 +++++ libxkbui.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libxkbui.changes b/libxkbui.changes index 8247eb1..6cf2114 100644 --- a/libxkbui.changes +++ b/libxkbui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 25 14:26:17 UTC 2023 - Frederic Crozat + +- Add baselibs.conf as source to specfile. + ------------------------------------------------------------------- Tue Apr 16 07:15:32 UTC 2013 - mmeister@suse.com diff --git a/libxkbui.spec b/libxkbui.spec index 2a66ad0..1cd31cf 100644 --- a/libxkbui.spec +++ b/libxkbui.spec @@ -1,7 +1,7 @@ # # spec file for package libxkbui # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -23,11 +23,12 @@ Release: 0 Summary: X11 keyboard UI presentation 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/libxkbui #Git-Web: http://cgit.freedesktop.org/xorg/lib/libxkbui/ Source: http://ftp.x.org/pub/X11R7.1/src/lib/%{name}-X11R7.1-%{version}.tar.bz2 +Source1: baselibs.conf Patch1: libxkbui.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.57, automake, libtool From 78ca51748da98ac3fec6f5069c4a85c3a1713adba2d015b007e4247fbae0ee3a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 26 Apr 2023 10:43:40 +0000 Subject: [PATCH 3/3] Accepting request 1082920 from home:jengelh:branches:X11:XOrg - Modernize specfile constructs OBS-URL: https://build.opensuse.org/request/show/1082920 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libxkbui?expand=0&rev=13 --- libxkbui.changes | 5 +++++ libxkbui.spec | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libxkbui.changes b/libxkbui.changes index 6cf2114..d4bb40f 100644 --- a/libxkbui.changes +++ b/libxkbui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 08:44:22 UTC 2023 - Jan Engelhardt + +- Modernize specfile constructs + ------------------------------------------------------------------- Tue Apr 25 14:26:17 UTC 2023 - Frederic Crozat diff --git a/libxkbui.spec b/libxkbui.spec index 1cd31cf..22cfce7 100644 --- a/libxkbui.spec +++ b/libxkbui.spec @@ -30,7 +30,6 @@ URL: http://xorg.freedesktop.org/ Source: http://ftp.x.org/pub/X11R7.1/src/lib/%{name}-X11R7.1-%{version}.tar.bz2 Source1: baselibs.conf Patch1: libxkbui.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.57, automake, libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) @@ -62,15 +61,14 @@ This package contains the development headers for the library found in %lname. %prep -%setup -qn %name-X11R7.1-%version -%patch -P 1 -p0 +%autosetup -n %name-X11R7.1-%version -p0 %build %configure --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR="%buildroot" +%make_install rm -f "%buildroot/%_libdir"/*.la %post -n %lname -p /sbin/ldconfig @@ -78,11 +76,9 @@ rm -f "%buildroot/%_libdir"/*.la %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) %_libdir/libxkbui.so.1* %files devel -%defattr(-,root,root) %_includedir/X11/* %_libdir/libxkbui.so %_libdir/pkgconfig/xkbui.pc