From f4c9ffc38149f6619fd5ea4d16ae555c21cafb9ccba59a1ef141907dce49a3c0 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 31 Dec 2022 13:22:31 +0000
Subject: [PATCH] Accepting request 1041728 from home:dirkmueller:Factory

- update to 1.1.2:
  * configure: Use AC_SYS_LARGEFILE to enable large file support
- modernize spec file, install license to licensedir

OBS-URL: https://build.opensuse.org/request/show/1041728
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libxkbfile?expand=0&rev=22
---
 libxkbfile-1.1.1.tar.xz |  3 ---
 libxkbfile-1.1.2.tar.xz |  3 +++
 libxkbfile.changes      |  7 ++++++
 libxkbfile.spec         | 49 ++++++++++++++++++-----------------------
 4 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 libxkbfile-1.1.1.tar.xz
 create mode 100644 libxkbfile-1.1.2.tar.xz

diff --git a/libxkbfile-1.1.1.tar.xz b/libxkbfile-1.1.1.tar.xz
deleted file mode 100644
index d667c18..0000000
--- a/libxkbfile-1.1.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8623dc26e7aac3c5ad8a25e57b566f4324f5619e5db38457f0804ee4ed953443
-size 308832
diff --git a/libxkbfile-1.1.2.tar.xz b/libxkbfile-1.1.2.tar.xz
new file mode 100644
index 0000000..3f2ad3f
--- /dev/null
+++ b/libxkbfile-1.1.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8a3784fac420b201718047cfb6c2d5ee7e8b9481564c2667b4215f6616644b1
+size 311428
diff --git a/libxkbfile.changes b/libxkbfile.changes
index 6d8d688..4eb294b 100644
--- a/libxkbfile.changes
+++ b/libxkbfile.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  8 20:55:13 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.1.2:
+  * configure: Use AC_SYS_LARGEFILE to enable large file support
+- modernize spec file, install license to licensedir
+
 -------------------------------------------------------------------
 Tue Oct 18 11:09:38 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/libxkbfile.spec b/libxkbfile.spec
index ed29e85..3a81eeb 100644
--- a/libxkbfile.spec
+++ b/libxkbfile.spec
@@ -16,21 +16,18 @@
 #
 
 
-Name:           libxkbfile
 %define lname	libxkbfile1
-Version:        1.1.1
+Name:           libxkbfile
+Version:        1.1.2
 Release:        0
 Summary:        X11 keyboard file manipulation 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/libxkbfile
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libxkbfile/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -43,56 +40,54 @@ BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 libxkbfile is used by the X servers and utilities to parse the XKB
 configuration data files.
 
-%package -n %lname
+%package -n %{lname}
 Summary:        X11 keyboard file manipulation library
 # O/P added for 12.2
 Group:          System/Libraries
-Provides:       xorg-x11-libxkbfile = 7.6_%version-%release
-Obsoletes:      xorg-x11-libxkbfile < 7.6_%version-%release
 Requires:       xkeyboard-config
+Provides:       xorg-x11-libxkbfile = 7.6_%{version}-%{release}
+Obsoletes:      xorg-x11-libxkbfile < 7.6_%{version}-%{release}
 
-%description -n %lname
+%description -n %{lname}
 libxkbfile is used by the X servers and utilities to parse the XKB
 configuration data files.
 
 %package devel
 Summary:        Development files for the X11 keyboard file manipulation library
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %version
+Requires:       %{lname} = %{version}
 # O/P added for 12.2
-Provides:       xorg-x11-libxkbfile-devel = 7.6_%version-%release
-Obsoletes:      xorg-x11-libxkbfile-devel < 7.6_%version-%release
+Provides:       xorg-x11-libxkbfile-devel = 7.6_%{version}-%{release}
+Obsoletes:      xorg-x11-libxkbfile-devel < 7.6_%{version}-%{release}
 
 %description devel
 libxkbfile is used by the X servers and utilities to parse the XKB
 configuration data files.
 
 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)
-%_libdir/libxkbfile.so.1*
+%files -n %{lname}
+%license COPYING
+%{_libdir}/libxkbfile.so.1*
 
 %files devel
-%defattr(-,root,root)
-%_includedir/X11/*
-%_libdir/libxkbfile.so
-%_libdir/pkgconfig/xkbfile.pc
+%{_includedir}/X11/*
+%{_libdir}/libxkbfile.so
+%{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog