Hello community, here is the log from the commit of package duperemove for openSUSE:Factory checked in at 2015-01-20 19:04:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duperemove (Old) and /work/SRC/openSUSE:Factory/.duperemove.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duperemove" Changes: -------- --- /work/SRC/openSUSE:Factory/duperemove/duperemove.changes 2014-12-09 09:14:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.duperemove.new/duperemove.changes 2015-01-20 19:04:03.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 20 10:02:26 UTC 2015 - tchva...@suse.com + +- Cleanup a bit with spec-cleaner and fix few tiny issues +- Use install phase from upstream Makefile +- Move csum-test to test progs to prevent its install: + * do-not-install-test-binary.patch + +------------------------------------------------------------------- Old: ---- duperemove-v0.09.beta5.tar.gz New: ---- do-not-install-test-binary.patch v0.09.beta5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duperemove.spec ++++++ --- /var/tmp/diff_new_pack.QbzcwD/_old 2015-01-20 19:04:04.000000000 +0100 +++ /var/tmp/diff_new_pack.QbzcwD/_new 2015-01-20 19:04:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package duperemove # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,21 @@ # -%define modname duperemove -%define tar_version v0.09.beta5 - +%define tar_version 0.09.beta5 +%define samename btrfs-extent-same Name: duperemove -BuildRequires: gcc-c++ -BuildRequires: glib2-devel -BuildRequires: libgcrypt-devel Version: 0.09~beta5 Release: 0 Summary: Software to find duplicate extents in files and remove them License: GPL-2.0 Group: System/Filesystems Url: https://github.com/markfasheh/duperemove -Source: %{modname}-%{tar_version}.tar.gz +Source: https://github.com/markfasheh/%{name}/archive/v%{tar_version}.tar.gz +# PATCH-FIX-UPSTREAM: do not install test binary which is not really needed +Patch0: do-not-install-test-binary.patch +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: libgcrypt-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,36 +38,32 @@ console. It also has the option to remove duplicates on those file systems which support the btrfs-extent-same ioctl. -%define samename btrfs-extent-same -%package -n btrfs-extent-same +%package -n %{samename} Summary: Debug/Test tool to exercise the btrfs out-of-band deduplication ioctl Group: System/Filesystems -%description -n btrfs-extent-same +%description -n %{samename} Debug/Test tool to exercise a btrfs ioctl for deduplicating file regions. %prep -%setup -q -n %{modname}-%{tar_version} +%setup -q -n %{name}-%{tar_version} +# Set the destdir / prefix +sed -i \ + -e 's:DESTDIR =:DESTDIR ?=:g' \ + -e 's:%{_prefix}/local:/usr:g' \ + Makefile +%patch0 -p1 %build -make CFLAGS="%optflags" +make %{?_smp_mflags} CFLAGS="%{optflags}" %install -mkdir -p %{buildroot}/%{_sbindir} -cp %{_builddir}/%{modname}-%{tar_version}/%{modname} %{buildroot}/%{_sbindir} -cp %{_builddir}/%{modname}-%{tar_version}/hashstats %{buildroot}/%{_sbindir} -cp %{_builddir}/%{modname}-%{tar_version}/show-shared-extents %{buildroot}/%{_sbindir} -cp %{_builddir}/%{modname}-%{tar_version}/%{samename} %{buildroot}/%{_sbindir} -mkdir -p %{buildroot}%{_mandir}/man8 -cp %{_builddir}/%{modname}-%{tar_version}/%{modname}.8 %{buildroot}/%{_mandir}/man8/ -cp %{_builddir}/%{modname}-%{tar_version}/hashstats.8 %{buildroot}/%{_mandir}/man8/ -cp %{_builddir}/%{modname}-%{tar_version}/show-shared-extents.8 %{buildroot}/%{_mandir}/man8/ -cp %{_builddir}/%{modname}-%{tar_version}/%{samename}.8 %{buildroot}/%{_mandir}/man8/ +%make_install -%files -n btrfs-extent-same +%files -n %{samename} %defattr(-, root, root) %{_sbindir}/%{samename} -%{_mandir}/man?/%{samename}.8.gz +%{_mandir}/man?/%{samename}.8.* %files %defattr(-, root, root) @@ -74,8 +71,8 @@ %{_sbindir}/duperemove %{_sbindir}/hashstats %{_sbindir}/show-shared-extents -%{_mandir}/man?/%{modname}.8.gz -%{_mandir}/man?/hashstats.8.gz -%{_mandir}/man?/show-shared-extents.8.gz +%{_mandir}/man?/%{name}.8.* +%{_mandir}/man?/hashstats.8.* +%{_mandir}/man?/show-shared-extents.8.* %changelog ++++++ do-not-install-test-binary.patch ++++++ Index: duperemove-0.09.beta5/Makefile =================================================================== --- duperemove-0.09.beta5.orig/Makefile +++ duperemove-0.09.beta5/Makefile @@ -1,4 +1,4 @@ -RELEASE=v0.09.beta5 +RELEASE=v0.09.eta5 CC = gcc CFLAGS = -Wall -ggdb @@ -40,7 +40,8 @@ hashstats_obj = $(crypt_obj) rbtree.o ha show_shared_obj = rbtree.o util.o csum_test_obj = $(crypt_obj) util.o -progs = duperemove hashstats btrfs-extent-same show-shared-extents csum-test +progs = duperemove hashstats btrfs-extent-same show-shared-extents +test_progs = csum-test glib_CFLAGS=$(shell pkg-config --cflags glib-2.0) glib_LIBS=$(shell pkg-config --libs glib-2.0) @@ -58,7 +59,7 @@ MANDIR = $(SHAREDIR)/man .c.o: $(CC) $(CFLAGS) -c $< -o $@ $(LIBRARY_FLAGS) -all: $(progs) +all: $(progs) $(test_progs) #TODO: Replace this with an auto-dependency $(objects): $(HEADERS) duperemove: $(objects) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
