- Rediff patches for consistent patch level.

- Delete old specfile constructs.

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gamin?expand=0&rev=28

gamin-devel.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 27 11:15:33 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Rediff patches for consistent patch level.
+- Delete old specfile constructs.
+
 -------------------------------------------------------------------
 Thu Aug  8 11:56:53 UTC 2019 - Martin Liška <mliska@suse.cz>
 

gamin-devel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gamin-devel
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -74,41 +74,30 @@ monitor mechanism compatible with FAM, but not dependent on a system wide
 daemon.
 
 %prep
-%setup -q -n gamin-%version
-%patch -P 0 -p0
-%patch -P 1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
+%autosetup -n gamin-%version -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 %configure --disable-static --disable-server
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 rm "%{buildroot}%{_libdir}"/*.la
 
-%post   -n libgamin-%{packnum}   -p /sbin/ldconfig
-%postun -n libgamin-%{packnum}   -p /sbin/ldconfig
-
-%post   -n libfam%{famnum}-gamin -p /sbin/ldconfig
-%postun -n libfam%{famnum}-gamin -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgamin-%{packnum}
+%ldconfig_scriptlets -n libfam%{famnum}-gamin
 
 %files -n libgamin-%{packnum}
-%defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README Copyright TODO
 %{_libdir}/libgamin-%{vernum}.so.%{sonum}
 %{_libdir}/libgamin-%{vernum}.so.%{sonum}.*
 
 %files -n libfam%{famnum}-gamin
-%defattr(-,root,root)
 %{_libdir}/libfam.so.%{famnum}
 %{_libdir}/libfam.so.%{famnum}.*
 
 %files -n gamin-devel
-%defattr(-,root,root)
 %{_includedir}/fam.h
 %{_libdir}/libfam.so
 %{_libdir}/libgamin-%{vernum}.so

gamin-fam_abi_compatibility_FamErrlist.patch

@@ -1,6 +1,13 @@
---- libgamin/fam.h.orig	2009-07-25 01:23:31.000000000 +0200
-+++ libgamin/fam.h	2009-07-25 01:25:27.000000000 +0200
-@@ -214,14 +214,19 @@
+---
+ libgamin/fam.h     |   15 ++++++++++-----
+ libgamin/gam_api.c |    4 +++-
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+Index: gamin-0.1.10/libgamin/fam.h
+===================================================================
+--- gamin-0.1.10.orig/libgamin/fam.h
++++ gamin-0.1.10/libgamin/fam.h
+@@ -214,14 +214,19 @@ extern int FAMDebugLevel (FAMConnection
  #define FAM_DEBUG_VERBOSE 2
  
  /**
@@ -25,9 +32,11 @@
  
  /**
   * FAMNoExists:
---- libgamin/gam_api.c.orig	2009-07-25 01:25:45.000000000 +0200
-+++ libgamin/gam_api.c	2009-07-25 01:26:17.000000000 +0200
-@@ -40,7 +40,9 @@
+Index: gamin-0.1.10/libgamin/gam_api.c
+===================================================================
+--- gamin-0.1.10.orig/libgamin/gam_api.c
++++ gamin-0.1.10/libgamin/gam_api.c
+@@ -40,7 +40,9 @@ static enum {
      FAM_UNIMPLEM/* Unimplemented */
  } FAMError;
  

gamin-return.patch

@@ -1,5 +1,12 @@
---- server/gam_eq.c.orig	2008-12-22 21:58:44.000000000 +0100
-+++ server/gam_eq.c	2008-12-22 21:56:46.000000000 +0100
+---
+ server/gam_eq.c     |    2 +-
+ server/gam_server.c |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+Index: gamin-0.1.10/server/gam_eq.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_eq.c
++++ gamin-0.1.10/server/gam_eq.c
 @@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP
  {
  	gboolean done_work = FALSE;
@@ -9,8 +16,10 @@
  
  #ifdef GAM_EQ_VERBOSE
  	GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn));
---- server/gam_server.c.orig	2008-12-22 21:58:21.000000000 +0100
-+++ server/gam_server.c	2008-12-22 21:57:49.000000000 +0100
+Index: gamin-0.1.10/server/gam_server.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_server.c
++++ gamin-0.1.10/server/gam_server.c
 @@ -532,6 +532,7 @@ gam_error_signal_pipe_handler(gpointer u
      g_io_channel_read_chars(pipe_read_ioc, buf, sizeof(buf), NULL, NULL);
  
@@ -19,4 +28,3 @@
  }  
  
  static void
-

gamin.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 27 11:15:33 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Rediff patches for consistent patch level.
+- Delete old specfile constructs.
+
 -------------------------------------------------------------------
 Thu May  4 13:21:42 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 

gamin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gamin
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,8 @@ daemon.
 
 %package doc
 Summary:        Documentation for %{name}
-Group:          Development/Libraries/C and C++
+Group:          Documentation/HTML
+BuildArch:      noarch
 
 %description doc
 Documentation and help files for %{name}.
@@ -67,16 +68,11 @@ It is split off into its own subpackage to void file conflicts when both
 %{name} and %{name}-32bit are installed on a multiarch platform.
 
 %prep
-%setup -q
-%patch -P 0 -p0
-%patch -P 1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
+%autosetup -p1
 
 %build
 %configure --disable-static --enable-tests
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -95,7 +91,6 @@ rm %buildroot%{_includedir}/fam.h              \
 make tests || echo "**** WARNING TESTSUITE FAILS ****"
 
 %files server
-%defattr(-, root, root)
 %{_libexecdir}/gam_server
 
 %changelog