From ab776bbeab1786b8280a98244560d274b8f287537b55c9721f09ec02666fec0d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 16 Aug 2017 14:17:05 +0000 Subject: [PATCH 1/3] - Update to version 1.3.5: * look for locales directory at PROGRAM_DIRECTORY\locale on Windows * look for config at PROGRAM_DIRECTORY\rhashrc on Windows OBS-URL: https://build.opensuse.org/package/show/network:utilities/rhash?expand=0&rev=5 --- rhash-1.3.0-shared.patch | 18 +++++++++--------- rhash-1.3.4-src.tar.gz | 3 --- rhash-1.3.5-src.tar.gz | 3 +++ rhash.changes | 8 ++++++++ rhash.spec | 40 +++++++++++++++++++++++++++------------- 5 files changed, 47 insertions(+), 25 deletions(-) delete mode 100644 rhash-1.3.4-src.tar.gz create mode 100644 rhash-1.3.5-src.tar.gz diff --git a/rhash-1.3.0-shared.patch b/rhash-1.3.0-shared.patch index 76b38c7..43aafa7 100644 --- a/rhash-1.3.0-shared.patch +++ b/rhash-1.3.0-shared.patch @@ -1,10 +1,10 @@ Description: Install development files with shared library. Author: Kyrill Detinov -Index: rhash-1.3.4/Makefile +Index: RHash-1.3.5/Makefile =================================================================== ---- rhash-1.3.4.orig/Makefile -+++ rhash-1.3.4/Makefile -@@ -164,7 +164,7 @@ check: version.h +--- RHash-1.3.5.orig/Makefile ++++ RHash-1.3.5/Makefile +@@ -174,7 +174,7 @@ check: version.h echo "version=$(VERSION)" > bindings/version.properties [ -s dist/rhash.1.html ] @@ -13,12 +13,12 @@ Index: rhash-1.3.4/Makefile $(CC) $(OBJECTS) -o $@ $(ALLLDFLAGS) $(SHARED_TRG): $(OBJECTS) $(SHAREDLIB) -Index: rhash-1.3.4/librhash/Makefile +Index: RHash-1.3.5/librhash/Makefile =================================================================== ---- rhash-1.3.4.orig/librhash/Makefile -+++ rhash-1.3.4/librhash/Makefile -@@ -43,13 +43,14 @@ lib-shared: $(SONAME) - libs-all: lib-static lib-shared +--- RHash-1.3.5.orig/librhash/Makefile ++++ RHash-1.3.5/librhash/Makefile +@@ -49,13 +49,14 @@ dylib: $(DYNAME) + dll: $(DLLNAME) dist-clean: clean -install-lib-static: $(LIBRARY) install-headers diff --git a/rhash-1.3.4-src.tar.gz b/rhash-1.3.4-src.tar.gz deleted file mode 100644 index 8c320ef..0000000 --- a/rhash-1.3.4-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 -size 249357 diff --git a/rhash-1.3.5-src.tar.gz b/rhash-1.3.5-src.tar.gz new file mode 100644 index 0000000..e10a9a6 --- /dev/null +++ b/rhash-1.3.5-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e +size 316867 diff --git a/rhash.changes b/rhash.changes index e83ad06..297467b 100644 --- a/rhash.changes +++ b/rhash.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 16 14:09:59 UTC 2017 - mpluskal@suse.com + +- Update to version 1.3.5: + * look for locales directory at PROGRAM_DIRECTORY\locale on + Windows + * look for config at PROGRAM_DIRECTORY\rhashrc on Windows + ------------------------------------------------------------------- Tue Jun 13 08:09:55 UTC 2017 - mpluskal@suse.com diff --git a/rhash.spec b/rhash.spec index 424ee82..8c412b2 100644 --- a/rhash.spec +++ b/rhash.spec @@ -18,7 +18,7 @@ %define major 0 Name: rhash -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: Recursive Hasher License: MIT @@ -77,11 +77,11 @@ This package includes LibRHash development files. %lang_package %prep -%setup -q +%setup -q -n RHash-%{version} %patch0 -p1 %build -# Don't run parallel make — it doesn't work. +# Don't run parallel make %{?_smp_mflags} — it doesn't work. # Use OPTLDFLAGS="" not to strip binaries. make \ ADDCFLAGS="-DUSE_GETTEXT -rdynamic" \ @@ -111,23 +111,37 @@ make \ %postun -n librhash%{major} -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README dist/rhash.1.html -%{_bindir}/* -%{_mandir}/man?/* +%doc ChangeLog COPYING README %config(noreplace) %{_sysconfdir}/rhashrc +%{_sysconfdir}/rhashrc +%{_bindir}/ed2k-link +%{_bindir}/gost-hash +%{_bindir}/has160-hash +%{_bindir}/magnet-link +%{_bindir}/rhash +%{_bindir}/sfv-hash +%{_bindir}/tiger-hash +%{_bindir}/tth-hash +%{_bindir}/whirlpool-hash +%{_mandir}/man1/ed2k-link.1%{ext_man} +%{_mandir}/man1/gost-hash.1%{ext_man} +%{_mandir}/man1/has160-hash.1%{ext_man} +%{_mandir}/man1/magnet-link.1%{ext_man} +%{_mandir}/man1/rhash.1%{ext_man} +%{_mandir}/man1/sfv-hash.1%{ext_man} +%{_mandir}/man1/tiger-hash.1%{ext_man} +%{_mandir}/man1/tth-hash.1%{ext_man} +%{_mandir}/man1/whirlpool-hash.1%{ext_man} %files -n librhash%{major} -%defattr(-,root,root,-) -%{_libdir}/*.so.* +%{_libdir}/librhash.so.%{major}* %files devel -%defattr(-,root,root,-) %doc ChangeLog COPYING README -%{_includedir}/rhash* -%{_libdir}/*.so +%{_includedir}/rhash.h +%{_includedir}/rhash_torrent.h +%{_libdir}/librhash.so %files lang -f %{name}.lang -%defattr(-,root,root) %changelog From 8f745a69fab0edd7f3155fb49b5ff57e842183e349397378f45f30382e65b055 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 21 Aug 2017 05:39:11 +0000 Subject: [PATCH 2/3] Accepting request 517727 from home:linux4humans:sle11_software - Fix build on SLE 11 OBS-URL: https://build.opensuse.org/request/show/517727 OBS-URL: https://build.opensuse.org/package/show/network:utilities/rhash?expand=0&rev=6 --- rhash.changes | 5 +++++ rhash.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/rhash.changes b/rhash.changes index 297467b..53bf05a 100644 --- a/rhash.changes +++ b/rhash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 20 04:55:49 UTC 2017 - zenitur@ya.ru + +- Fix build on SLE 11 + ------------------------------------------------------------------- Wed Aug 16 14:09:59 UTC 2017 - mpluskal@suse.com diff --git a/rhash.spec b/rhash.spec index 8c412b2..f1da4ba 100644 --- a/rhash.spec +++ b/rhash.spec @@ -28,6 +28,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src. # PATCH-FIX-OPENSUSE rhash-1.3.0-shared.patch lazy.kent@opensuse.org -- install development files with shared library Patch0: rhash-1.3.0-shared.patch Recommends: %{name}-lang +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description RHash (Recurcive Hasher) is a console utility for computing and @@ -111,6 +112,7 @@ make \ %postun -n librhash%{major} -p /sbin/ldconfig %files +%defattr(-,root,root) %doc ChangeLog COPYING README %config(noreplace) %{_sysconfdir}/rhashrc %{_sysconfdir}/rhashrc @@ -134,9 +136,11 @@ make \ %{_mandir}/man1/whirlpool-hash.1%{ext_man} %files -n librhash%{major} +%defattr(-,root,root) %{_libdir}/librhash.so.%{major}* %files devel +%defattr(-,root,root) %doc ChangeLog COPYING README %{_includedir}/rhash.h %{_includedir}/rhash_torrent.h From bf04ccdfe95c2d7e92704b7ad4f49d44d783e46769e59346e06b462e3f0fdb2c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 21 Aug 2017 11:23:06 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/network:utilities/rhash?expand=0&rev=7 --- rhash.changes | 5 ----- rhash.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/rhash.changes b/rhash.changes index 53bf05a..297467b 100644 --- a/rhash.changes +++ b/rhash.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Aug 20 04:55:49 UTC 2017 - zenitur@ya.ru - -- Fix build on SLE 11 - ------------------------------------------------------------------- Wed Aug 16 14:09:59 UTC 2017 - mpluskal@suse.com diff --git a/rhash.spec b/rhash.spec index f1da4ba..8c412b2 100644 --- a/rhash.spec +++ b/rhash.spec @@ -28,7 +28,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src. # PATCH-FIX-OPENSUSE rhash-1.3.0-shared.patch lazy.kent@opensuse.org -- install development files with shared library Patch0: rhash-1.3.0-shared.patch Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description RHash (Recurcive Hasher) is a console utility for computing and @@ -112,7 +111,6 @@ make \ %postun -n librhash%{major} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc ChangeLog COPYING README %config(noreplace) %{_sysconfdir}/rhashrc %{_sysconfdir}/rhashrc @@ -136,11 +134,9 @@ make \ %{_mandir}/man1/whirlpool-hash.1%{ext_man} %files -n librhash%{major} -%defattr(-,root,root) %{_libdir}/librhash.so.%{major}* %files devel -%defattr(-,root,root) %doc ChangeLog COPYING README %{_includedir}/rhash.h %{_includedir}/rhash_torrent.h