[packages/libtrash] - updated to 3.7

[qboosh]

commit 35cb4d6b10c018847cfd42b2f98d87676bb1b664
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 8 19:32:31 2024 +0200

    - updated to 3.7

 libtrash-Makefile.patch | 12 ------------
 libtrash-noproc.patch   | 12 ------------
 libtrash-py24.patch     | 26 --------------------------
 libtrash.spec           | 44 ++++++++++++++++++++------------------------
 4 files changed, 20 insertions(+), 74 deletions(-)
---
diff --git a/libtrash.spec b/libtrash.spec
index 9363e05..a023da4 100644
--- a/libtrash.spec
+++ b/libtrash.spec
@@ -1,19 +1,16 @@
 Summary:	Libraries to move files to a trash on delete
 Summary(pl.UTF-8):	Biblioteka do automatycznego przenoszenia usuwanych plików do kosza
 Name:		libtrash
-Version:	3.2
-Release:	4
-License:	GPL
+Version:	3.7
+Release:	1
+License:	GPL v2+
 Group:		Libraries
-Source0:	http://pages.stern.nyu.edu/~marriaga/software/libtrash/%{name}-%{version}.tgz
-# Source0-md5:	56f7b54f50d760e4719f73b98cd8b43a
-Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-py24.patch
-Patch2:		%{name}-noproc.patch
-URL:		http://pages.stern.nyu.edu/~marriaga/software/libtrash/
-BuildRequires:	/sbin/ldconfig
-BuildRequires:	perl-base
-BuildRequires:	python
+Source0:	https://pages.stern.nyu.edu/~marriaga/software/libtrash/%{name}-%{version}.tgz
+# Source0-md5:	7eeda8187327588ad32bbcb80f33e796
+URL:		https://pages.stern.nyu.edu/~marriaga/software/libtrash/
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake
+BuildRequires:	libtool >= 2:2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,26 +27,25 @@ dostępne w strukturze katalogów podobnej do tej sprzed usunięcia.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -D_REENTRANT"
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_sysconfdir}}
 
 %{__make} install \
-	INSTLIBDIR=$RPM_BUILD_ROOT%{_libdir} \
-	SYSCONFFILE=$RPM_BUILD_ROOT%{_sysconfdir}/libtrash.conf
+	DESTDIR=$RPM_BUILD_ROOT
 
 # no devel package
-/sbin/ldconfig -N -n $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtrash.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libtrash.{so,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGE.LOG README config.txt TODO
+%doc ChangeLog NEWS README.md TODO config.txt
 %attr(755,root,root) %{_libdir}/libtrash.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtrash.so.3
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libtrash.conf
diff --git a/libtrash-Makefile.patch b/libtrash-Makefile.patch
deleted file mode 100644
index 483772c..0000000
--- a/libtrash-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libtrash-1.1.old/src/Makefile libtrash-1.1/src/Makefile
---- libtrash-1.1.old/src/Makefile	Sun May 26 20:27:13 2002
-+++ libtrash-1.1/src/Makefile	Sun Jun  2 12:02:41 2002
-@@ -28,7 +28,7 @@
- install-libtrash: 
- 	TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION}
- 	TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE}
--	ldconfig	
-+	
- 
- clean:
- 	rm -f *~
diff --git a/libtrash-noproc.patch b/libtrash-noproc.patch
deleted file mode 100644
index 8df5bc1..0000000
--- a/libtrash-noproc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libtrash-3.2/src/Makefile~	2008-08-15 18:32:27.000000000 +0300
-+++ libtrash-3.2/src/Makefile	2008-08-15 18:32:48.545555398 +0300
-@@ -19,9 +19,6 @@
- libtrash: libtrash.so.${VERSION}
- 
- libtrash.so.${VERSION}: $(SRC) ../libtrash.conf
--	echo CHECKING FOR A WORKING PROC FILESYSTEM...
--	ls -d /proc/self/fd
--	echo GOOD, YOU SEEM TO HAVE A PROC FS
- 	$(CC) $(CFLAGS) -o linking-helper linking-helper.c
- 	perl -w ../scripts/trimheader.pl
- 	perl -w ../scripts/genheader.pl
diff --git a/libtrash-py24.patch b/libtrash-py24.patch
deleted file mode 100644
index 35bb433..0000000
--- a/libtrash-py24.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libtrash-3.2/scripts/get_symbol_versions.py~	2008-08-15 14:52:45.832409714 +0300
-+++ libtrash-3.2/scripts/get_symbol_versions.py	2008-08-15 14:52:55.753240164 +0300
-@@ -45,7 +45,10 @@
-     
-     if status == None: return ("0", output) # os.popen() returns None if exit code == 0
-     
--    return (str(os.WEXITSTATUS(status)) if os.WIFEXITED(status) else "EXITED ABNORMALLY", output)
-+    if os.WIFEXITED(status):
-+        return str(os.WEXITSTATUS(status), output)
-+
-+    return str("EXITED ABNORMALLY", output)
- 
- 
- def main():
-@@ -170,9 +173,9 @@
- 
- if not \
- (sys.version_info[0] > 2 or \
--(sys.version_info[0] == 2 and sys.version_info[1] >= 5)):
-+(sys.version_info[0] == 2 and sys.version_info[1] >= 4)):
-     
--    print "You need to have Python >= 2.5 installed!"
-+    print "You need to have Python >= 2.4 installed!"
-     sys.exit(1)
-     pass
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtrash.git/commitdiff/35cb4d6b10c018847cfd42b2f98d87676bb1b664