diff --git a/.gitignore b/.gitignore index f4bbdde..468381d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ -/libXcursor-*.tar.xz +libXcursor-1.1.10.tar.bz2 +/libXcursor-1.1.11.tar.bz2 +/libXcursor-1.1.12.tar.bz2 +/libXcursor-1.1.13.tar.bz2 +/libXcursor-20130524.tar.bz2 +/libXcursor-1.1.14.tar.bz2 diff --git a/index.theme.rhel b/index.theme.rhel new file mode 100644 index 0000000..6eed8fe --- /dev/null +++ b/index.theme.rhel @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=dmz-aa diff --git a/libXcursor.spec b/libXcursor.spec index 7c7137f..da1af0c 100644 --- a/libXcursor.spec +++ b/libXcursor.spec @@ -4,9 +4,10 @@ Summary: Cursor management library Name: libXcursor -Version: 1.2.3 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: HPND-sell-variant +Version: 1.1.14 +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT +Group: System Environment/Libraries URL: http://www.x.org %if 0%{?gitdate} @@ -14,13 +15,13 @@ Source0: %{tarball}-%{gitdate}.tar.bz2 Source2: make-git-snapshot.sh Source3: commitid %else -Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif Source1: index.theme +Source4: index.theme.rhel Requires: libX11 >= 1.5.99.902 -BuildRequires: make BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -37,6 +38,7 @@ several sizes and the library automatically picks the best size. %package devel Summary: Development files for %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -66,22 +68,31 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/default +%if 0%{?rhel} +install -m 644 -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme +%else install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme +%endif # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%ldconfig_post -%ldconfig_postun +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc AUTHORS COPYING README.md +%defattr(-,root,root,-) +%doc AUTHORS COPYING README %{_libdir}/libXcursor.so.1 %{_libdir}/libXcursor.so.1.0.2 %dir %{_datadir}/icons/default %{_datadir}/icons/default/index.theme %files devel +%defattr(-,root,root,-) %dir %{_includedir}/X11/Xcursor %{_includedir}/X11/Xcursor/Xcursor.h %if %{with_static} @@ -93,96 +104,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/Xcursor*.3* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Nov 07 2024 José Expósito - 1.2.3-1 -- libXcursor 1.2.3 - -* Thu Jul 18 2024 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Mar 04 2024 José Expósito - 1.2.2-1 -- libXcursor 1.2.2 - -* Thu Jan 25 2024 Fedora Release Engineering - 1.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 06 2023 Benjamin Tissoires - 1.2.1-5 -- SPDX Migration - -* Thu Jul 20 2023 Fedora Release Engineering - 1.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Apr 11 2022 Peter Hutterer - 1.2.1-1 -- libXcursor 1.2.1 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 11:15:57 AEST 2020 Peter Hutterer - 1.2.0-4 -- Add BuildRequires for make - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Sep 26 2019 Adam Jackson - 1.2.0-1 -- libXcursor 1.2.0 - -* Thu Jul 25 2019 Fedora Release Engineering - 1.1.15-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.1.15-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.1.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Adam Jackson - 1.1.15-3 -- Drop useless %%defattr - -* Fri Jun 29 2018 Adam Jackson - 1.1.15-2 -- Use ldconfig scriptlet macros - -* Mon Feb 26 2018 Benjamin Tissoires 1.1.15-1%{?gitdate:.git}%{?dist} -- libXcursor 1.1.15 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.14-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.1.14-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.14-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 17 2017 Benjamin Tissoires 1.1.14-8 -- Remove RHEL default cursor theme variant (rhbz#1388458) - -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.14-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - * Thu Feb 04 2016 Fedora Release Engineering - 1.1.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 552fa66..b980a90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXcursor-1.2.3.tar.xz) = 069a1eb27a0ee1b29b251bb6c2d0688543a791d6862fad643279e86736e1c12ca6fc02b85b8611c225a9735dc00efab84672d42b547baa97304362f0c5ae0b5a +1e7c17afbbce83e2215917047c57d1b3 libXcursor-1.1.14.tar.bz2