From 879c4fcd3347051bae6d22f74375bd8138204d3b Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 14 Jan 2025 15:53:27 +0300 Subject: [PATCH] Rebuild For MSVSphere 10 --- .gitignore | 2 +- .inotify-tools.metadata | 2 +- SPECS/inotify-tools.spec | 66 ++++++++++++++++++++++++++++++++-------- 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index b98c1bd..7369c93 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/inotify-tools-3.22.1.0.tar.gz +SOURCES/inotify-tools-4.23.9.0.tar.gz diff --git a/.inotify-tools.metadata b/.inotify-tools.metadata index 4596345..aacaef3 100644 --- a/.inotify-tools.metadata +++ b/.inotify-tools.metadata @@ -1 +1 @@ -dfb92b158873d0d832484c6632b0c301785bd71d SOURCES/inotify-tools-3.22.1.0.tar.gz +b361b763f704d45d7c1771e5d6a4b9096732374a SOURCES/inotify-tools-4.23.9.0.tar.gz diff --git a/SPECS/inotify-tools.spec b/SPECS/inotify-tools.spec index 9cd4313..305ad18 100644 --- a/SPECS/inotify-tools.spec +++ b/SPECS/inotify-tools.spec @@ -1,13 +1,16 @@ Name: inotify-tools -Version: 3.22.1.0 -Release: 1%{?dist} +Version: 4.23.9.0 +Release: 2%{?dist} Summary: Command line utilities for inotify -License: GPLv2 -URL: https://github.com/inotify-tools/inotify-tools +# GPL-2.0-only: the project as a whole +# GPL-2.0-only WITH Linux-syscall-note: libinotifytools/src/inotifytools/fanotify-dfid-name.h +# LGPL-2.1-or-later: libinotifytools/src/redblack.{cpp,h} +License: GPL-2.0-only AND GPL-2.0-only WITH Linux-syscall-note AND LGPL-2.1-or-later +URL: https://github.com/inotify-tools/inotify-tools Source0: https://github.com/inotify-tools/inotify-tools/archive/%{version}/inotify-tools-%{version}.tar.gz -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen @@ -21,7 +24,7 @@ and act upon filesystem events. %package devel Summary: Headers and libraries for building apps that use libinotifytools -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains headers and libraries required to build applications @@ -36,13 +39,21 @@ that use the libinotifytools library. %configure \ --disable-dependency-tracking \ --disable-static \ - --enable-doxygen -./rh_build.sh %{?_smp_mflags} + --enable-doxygen \ + --enable-fanotify + +# Get rid of undesirable hardcoded rpaths; workaround libtool reordering +# -Wl,--as-needed after all the libraries. +sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' \ + -i libtool + +%make_build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%make_install find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' # We'll install documentation in the proper place @@ -55,6 +66,8 @@ rm -rf %{buildroot}/%{_datadir}/doc/ %files %doc AUTHORS COPYING ChangeLog NEWS README.md +%{_bindir}/fsnotifywait +%{_bindir}/fsnotifywatch %{_bindir}/inotifywait %{_bindir}/inotifywatch %{_libdir}/libinotifytools.so.* @@ -75,10 +88,37 @@ rm -rf %{buildroot}/%{_datadir}/doc/ %changelog -* Mon Sep 02 2024 Eduard Basov - 3.22.1.0-1 -- Rebuilt for MSVSphere 9.4 +* Tue Jan 14 2025 Eduard Basov - 4.23.9.0-2 +- Rebuild For MSVSphere 10 + +* Thu Jul 18 2024 Fedora Release Engineering - 4.23.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed May 22 2024 Jerry James - 4.23.9.0-1 +- Update to 4.23.9.0 +- SPDX migration +- Enable fanotify support +- Minor spec file cleanups + +* Wed Jan 24 2024 Fedora Release Engineering - 3.22.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 3.22.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 3.22.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.22.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.22.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 3.22.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Wed Jan 19 2022 Eric Curtin - 3.22.1.0-1 +* Wed Sep 22 2021 Eric Curtin - 3.22.1.0-1 - Update to 3.22.1.0 * Wed Sep 22 2021 Eric Curtin - 3.21.9.5-1