summaryrefslogtreecommitdiffstats
path: root/diffmark.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-09-29 09:15:20 +0200
committerRemi Collet <fedora@famillecollet.com>2013-09-29 09:15:20 +0200
commit38d9939e5ed50fce098aae1be2d49f2d46858321 (patch)
treec035b4fce030739e367486eadc29520bb6abe1c7 /diffmark.spec
parent3b25547494c2c0e325aa1fef29c6156ca825ee0f (diff)
diffmark: backport for EL and old fedoraHEADmaster
Diffstat (limited to 'diffmark.spec')
-rw-r--r--diffmark.spec18
1 files changed, 6 insertions, 12 deletions
diff --git a/diffmark.spec b/diffmark.spec
index 62a78c5..1353ebc 100644
--- a/diffmark.spec
+++ b/diffmark.spec
@@ -1,6 +1,6 @@
Name: diffmark
Version: 0.10
-Release: 6%{?dist}
+Release: 1%{?dist}
Summary: XML diff and merge
Group: Applications/Text
# The library code has it's own license
@@ -11,6 +11,7 @@ URL: http://www.mangrove.cz/%{name}/
Source0: %{url}%{name}-%{version}.tar.gz
# Superfluous RPATH in programs
Patch0: %{name}-0.09-remove_rpath.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel
# Because of diffmark-0.08-remove_rpath.patch:
# And to update config.sub to support aarch64, bug #925255:
@@ -47,30 +48,23 @@ find "$RPM_BUILD_ROOT" -name '*.la' -exec rm -f {} +
%postun -p /sbin/ldconfig
%files
+%defattr(-,root,root,-)
%doc COPYING doc/*.html README
%{_bindir}/*
%{_libdir}/*.so.*
%files devel
+%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Sun Sep 29 2013 Remi Collet <remi@fedoraproject.org> - 0.10-1
+- rebuild for remi repo
* Wed Mar 27 2013 Petr Pisar <ppisar@redhat.com> - 0.10-5
- Update config.sub to support aarch64 (bug #925255)
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
* Mon Nov 21 2011 Petr Pisar <ppisar@redhat.com> - 0.10-1
- 0.10 bump