From 3a28c7bd8f3a84bf38fab7ce53e896fdc3463421ca45a478395f150410ecda65 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 4 Jun 2015 09:54:41 +0000 Subject: [PATCH] Accepting request 310266 from home:pluskalm:branches:Archiving:Backup - Update to 6.3-3 * for list of changes see Changelog - Cleanup spec file with spec-cleaner - Update license information - Use url for source OBS-URL: https://build.opensuse.org/request/show/310266 OBS-URL: https://build.opensuse.org/package/show/Archiving:Backup/freedup?expand=0&rev=3 --- freedup-1.4-4-src.tar.bz2 | 3 -- freedup-1.4-4.patch | 22 ------------ freedup-1.6~3-src.tar.bz2 | 3 ++ freedup.changes | 9 +++++ freedup.spec | 72 +++++++++++++++++++-------------------- 5 files changed, 47 insertions(+), 62 deletions(-) delete mode 100644 freedup-1.4-4-src.tar.bz2 delete mode 100644 freedup-1.4-4.patch create mode 100644 freedup-1.6~3-src.tar.bz2 diff --git a/freedup-1.4-4-src.tar.bz2 b/freedup-1.4-4-src.tar.bz2 deleted file mode 100644 index 264240c..0000000 --- a/freedup-1.4-4-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4d960350ce56ea1c758f9e65c8b161babcf1ff68e2a926007e3a82194b9f0c6 -size 167109 diff --git a/freedup-1.4-4.patch b/freedup-1.4-4.patch deleted file mode 100644 index 17db40b..0000000 --- a/freedup-1.4-4.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.tests -+++ Makefile.tests -@@ -17,7 +17,7 @@ - # a long list of test routines follows - # The intention is to verify that at least some basic functions work well (hopefully) - # --test: user_is_root test0 test1 test2 test3 test4 test5 test6 test7 test9 test10 test11 -+test: user_is_root test0 test1 test2 test3 test5 test7 test9 test10 test11 - alltest: user_is_root test0 test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 - - user_is_root: ---- freedup.c -+++ freedup.c -@@ -295,7 +295,7 @@ - return; - } - --inline int hashed(const char*s) -+int hashed(const char*s) - { - int returnval=atoi(s); - diff --git a/freedup-1.6~3-src.tar.bz2 b/freedup-1.6~3-src.tar.bz2 new file mode 100644 index 0000000..7cecbbd --- /dev/null +++ b/freedup-1.6~3-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49e4fa3d4fc937c4e2e40dd14ca9300690b5a83caae6fa338db8371e88925f58 +size 230625 diff --git a/freedup.changes b/freedup.changes index 75ccd81..fbadfb4 100644 --- a/freedup.changes +++ b/freedup.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 4 09:46:26 UTC 2015 - mpluskal@suse.com + +- Update to 6.3-3 + * for list of changes see Changelog +- Cleanup spec file with spec-cleaner +- Update license information +- Use url for source + ------------------------------------------------------------------- Tue Jan 29 10:07:42 CET 2008 - mskibbe@suse.de diff --git a/freedup.spec b/freedup.spec index 425ec70..6bccffc 100644 --- a/freedup.spec +++ b/freedup.spec @@ -1,66 +1,64 @@ # -# spec file for package rsnapshot (Version 1.3.0) +# spec file for package freedup # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%define mainversion 1.4 -%define subversion 4 -Name: freedup -URL: http://freedup.org/ -License: GNU General Public License (GPL) -Group: Productivity/Archiving/Backup -Version: %{mainversion}.%{subversion} -Release: 0 -Summary: Links substantially identical, duplicate files to save file system space. -Source: %{name}-%{mainversion}-%{subversion}-src.tar.bz2 -Patch1: %{name}-%{mainversion}-%{subversion}.patch -#BuildRequires: -#Requires: -Autoreqprov: on -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +%define mainversion 1.6 +%define subversion 3 +Name: freedup +Version: %{mainversion}~%{subversion} +Release: 0 +Summary: Links substantially identical, duplicate files to save file system space +License: GPL-2.0 and BSD-3-Clause +Group: Productivity/Archiving/Backup +Url: http://freedup.org/ +Source: http://freedup.org/freedup-%{version}-src.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Freedup eliminates duplicate files by linking them, and thus reduces the amount -of used disk space within one or more file systems. By default, hardlinks are -used on a single device, symbolic links when the devices differ. A set of +of used disk space within one or more file systems. By default, hardlinks are +used on a single device, symbolic links when the devices differ. A set of options allows you to modify the methods of file comparison, the hash functions, the linking behavior, and the reporting style. You may use batch or interactive mode. Freedup usually only considers identical files, but when comparing audio or graphics files, you may elect to ignore the tags. Multimedia files often are a good target for deduplication. - %prep -%setup -n %{name}-%{mainversion} -%patch1 - +%setup -q -n %{name}-%{mainversion}-%{subversion} rm %{name} %build -make +make CFLAGS='%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DFLAVOUR="\"d\"" -DHASHSUM=0 -std=gnu99' %{name} %install -%makeinstall \ - PRE=%{buildroot} +make \ + DESTDIR=%{buildroot} \ + PRE=%{buildroot} \ + install \ + %{?_smp_mflags} -chmod -x %{buildroot}/%{_mandir}/man1/freedup.1.gz - -%clean -[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && %__rm -rf "%{buildroot}"; +chmod -x %{buildroot}/%{_mandir}/man1/* %files %defattr(-,root,root) +%doc COPYING COPYING.SHA ChangeLog %{_bindir}/freedup -%{_mandir}/man1/freedup.1.gz - +%{_bindir}/symharden +%{_mandir}/man1/* %changelog