diff --git a/.gitignore b/.gitignore index f4bbdde..e682cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libXcursor-*.tar.xz +libXcursor-1.1.10.tar.bz2 diff --git a/commitid b/commitid deleted file mode 100644 index 95d4c70..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -8f677eaea05290531d007d1fec2768119926088d diff --git a/index.theme b/index.theme index cda0b19..6eed8fe 100644 --- a/index.theme +++ b/index.theme @@ -1,2 +1,2 @@ [Icon Theme] -Inherits=Adwaita +Inherits=dmz-aa diff --git a/libXcursor.spec b/libXcursor.spec index 7c7137f..cfad508 100644 --- a/libXcursor.spec +++ b/libXcursor.spec @@ -1,33 +1,22 @@ -%global tarball libXcursor -#global gitdate 20130524 -%global gitversion 8f677eaea - Summary: Cursor management library Name: libXcursor -Version: 1.2.3 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: HPND-sell-variant +Version: 1.1.10 +Release: 5%{?dist} +License: MIT +Group: System Environment/Libraries URL: http://www.x.org - -%if 0%{?gitdate} -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 -%endif +#VCS: git:git://anongit.freedesktop.org/xorg/lib/libXcursor +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 Source1: index.theme +# the default cursor theme inherits from this +Requires: dmz-cursor-themes -Requires: libX11 >= 1.5.99.902 - -BuildRequires: make -BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: libX11-devel >= 1.5.99.902 +BuildRequires: libX11-devel BuildRequires: libXfixes-devel BuildRequires: libXrender-devel >= 0.8.2 -BuildRequires: autoconf automake libtool pkgconfig + %description This is a simple library designed to help locate and load cursors. @@ -37,13 +26,15 @@ several sizes and the library automatically picks the best size. %package devel Summary: Development files for %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel libXcursor development package. %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q iconv --from=ISO-8859-2 --to=UTF-8 COPYING > COPYING.new && \ touch -r COPYING COPYING.new && \ mv COPYING.new COPYING @@ -52,7 +43,6 @@ mv COPYING.new COPYING %define with_static 0 %build -autoreconf -v --install --force #export CFLAGS="$RPM_OPT_FLAGS -DICONDIR=\"%{_datadir}/icons\"" %configure \ %if ! %{with_static} @@ -71,17 +61,22 @@ install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.them # 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 ChangeLog %{_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,152 +88,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 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.1.14-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 1.1.14-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.1.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 31 2013 Peter Hutterer 1.1.14-1 -- libXCursor 1.1.14 - -* Mon May 27 2013 Peter Hutterer - 1.1.13-7.20130524git8f677eaea -- Require libX11 1.6RC2 for _XEatDataWords - -* Fri May 24 2013 Adam Jackson 1.1.13-6 -- Fix cursor theme in RHEL - -* Fri May 24 2013 Peter Hutterer 1.1.13-3.20130524git8f677eaea -- Update to fix following CVEs: -- CVE-2013-2003 - -* Thu Mar 07 2013 Peter Hutterer - 1.1.13-4 -- autoreconf for aarch64 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.1.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.1.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Mar 08 2012 Adam Jackson 1.1.13-1 -- libXcursor 1.1.13 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.1.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Nov 17 2011 Adam Jackson 1.1.12-1 -- libXcursor 1.1.12 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Feb 04 2011 Ray Strode 1.1.11-2 -- Change the default cursor theme - (also make the dependency a soft one) - -* Thu Oct 28 2010 Adam Jackson 1.1.11-1 -- libXcursor 1.1.11 - * Thu Mar 11 2010 Matthias Clasen - 1.1.10-5 - The theme file should _not_ be a config file diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 1b3d8d3..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -DIRNAME=libXcursor-$( date +%Y%m%d ) - -rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/xorg/lib/libXcursor $DIRNAME -cd $DIRNAME -if [ -z "$1" ]; then - git log | head -1 -else - git checkout $1 -fi -git log | head -1 | awk '{ print $2 }' > ../commitid -git repack -a -d -cd .. -tar jcf $DIRNAME.tar.bz2 $DIRNAME -rm -rf $DIRNAME diff --git a/sources b/sources index 552fa66..549a219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXcursor-1.2.3.tar.xz) = 069a1eb27a0ee1b29b251bb6c2d0688543a791d6862fad643279e86736e1c12ca6fc02b85b8611c225a9735dc00efab84672d42b547baa97304362f0c5ae0b5a +7dcdad1c10daea872cb3355af414b2ca libXcursor-1.1.10.tar.bz2