[spor] Add spor-1.0-Makefile.patch (Fix mass rebuilt FTBS).
corsepiu
corsepiu at fedoraproject.org
Mon Jul 23 06:49:52 UTC 2012
commit d8311f64d1bc43f0f9302ccfaf2300478d8cbe29
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Mon Jul 23 08:49:39 2012 +0200
Add spor-1.0-Makefile.patch (Fix mass rebuilt FTBS).
- Modernize spec.
spor-1.0-Makefile.patch | 12 ++++++++++++
spor.spec | 15 ++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/spor-1.0-Makefile.patch b/spor-1.0-Makefile.patch
new file mode 100644
index 0000000..1180bf8
--- /dev/null
+++ b/spor-1.0-Makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur spor.orig/Makefile spor/Makefile
+--- spor.orig/Makefile 2010-11-08 00:48:28.000000000 +0100
++++ spor/Makefile 2012-07-23 08:44:53.876788872 +0200
+@@ -17,7 +17,7 @@
+ rm -f $(OBJECTS) spor
+
+ spor: $(OBJECTS)
+- $(CC) $(CFLAGS) -Wl -o $@ $^
++ $(CC) $(CFLAGS) -o $@ $^
+
+ $(OBJECTS): spor.c spor.h spor-ftw.c
+
diff --git a/spor.spec b/spor.spec
index e77ee67..f51e3e2 100644
--- a/spor.spec
+++ b/spor.spec
@@ -2,7 +2,7 @@ Name: spor
Group: Applications/System
Summary: Store file modes (permission/ownership) recursively
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv3+
URL: http://code.google.com/p/spor
Source0: http://spor.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -10,8 +10,8 @@ Source0: http://spor.googlecode.com/files/%{name}-%{version}.tar.bz2
# Build changes
# http://code.google.com/p/spor/issues/detail?id=1
Patch0: spor.1.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Remove invalid -Wl from linker call
+Patch1: spor-1.0-Makefile.patch
%description
Spor recursively walks into a given directory, storing file mode & ownership
@@ -23,18 +23,15 @@ of a given directory.
%prep
%setup -q -n %{name}
%patch0 -p1 -b .spor.1.man
+%patch1 -p1
%build
%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
%install
-%{__rm} -rf %{buildroot}
%{__install} -D -p -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}
%{__install} -D -p -m 0644 %{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%doc readme.txt LICENSE
@@ -42,6 +39,10 @@ of a given directory.
%{_mandir}/man1/%{name}.1*
%changelog
+* Mon Jul 23 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.0-7
+- Add spor-1.0-Makefile.patch (Fix mass rebuilt FTBS).
+- Modernize spec.
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list