diff options
| -rw-r--r-- | diffmark-0.09-remove_rpath.patch | 15 | ||||
| -rw-r--r-- | diffmark.spec | 83 |
2 files changed, 98 insertions, 0 deletions
diff --git a/diffmark-0.09-remove_rpath.patch b/diffmark-0.09-remove_rpath.patch new file mode 100644 index 0000000..1c7b0bc --- /dev/null +++ b/diffmark-0.09-remove_rpath.patch @@ -0,0 +1,15 @@ +Remove RPATH + +Then libtoolize -f && autoreconf to get rid of RPATH in libtool. + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 951a1c5..6f53a59 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -9,5 +9,5 @@ diffmarkinc_HEADERS = compare.hh compareimpl.hh diff.hh lcs.hh lcsimpl.hh link.h + + libdiffmark_la_SOURCES = compare.cc diff.cc link.cc merge.cc namespacecollector.cc nspace.cc target.cc xbuffer.cc xdoc.cc xutil.cc + +-libdiffmark_la_LDFLAGS = -rpath $(libdir) -version-info 2:3:1 @DEPS_LIBS@ -lstdc++ ++libdiffmark_la_LDFLAGS = -version-info 2:3:1 @DEPS_LIBS@ -lstdc++ + diff --git a/diffmark.spec b/diffmark.spec new file mode 100644 index 0000000..62a78c5 --- /dev/null +++ b/diffmark.spec @@ -0,0 +1,83 @@ +Name: diffmark +Version: 0.10 +Release: 6%{?dist} +Summary: XML diff and merge +Group: Applications/Text +# The library code has it's own license +# Parts of lib/lcs.hh is from Perl Algorithm::Diff module (GPL+ or Artistic) +# The build scripts are GPLv2+ +License: diffmark and GPLv2+ and (GPL+ or Artistic) +URL: http://www.mangrove.cz/%{name}/ +Source0: %{url}%{name}-%{version}.tar.gz +# Superfluous RPATH in programs +Patch0: %{name}-0.09-remove_rpath.patch +BuildRequires: libxml2-devel +# Because of diffmark-0.08-remove_rpath.patch: +# And to update config.sub to support aarch64, bug #925255: +BuildRequires: autoconf, automake, libtool + +%description +This is a XML diff and merge package. It consists of a shared library and +two utilities: dm and dm-merge. + +%package devel +Summary: Development files for %{name} library +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Header files and libraries for developing applications that use %{name}. + +%prep +%setup -q +%patch0 -p1 -b .rpath +# automake -i -f to support aarch64, bug #925255 +libtoolize --force && autoreconf -i -f + +%build +%configure --disable-static +make %{?_smp_mflags} + +%install +make install "DESTDIR=$RPM_BUILD_ROOT" +find "$RPM_BUILD_ROOT" -name '*.la' -exec rm -f {} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%doc COPYING doc/*.html README +%{_bindir}/* +%{_libdir}/*.so.* + +%files devel +%{_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 + +* 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 + +* Tue Nov 15 2011 Petr Pisar <ppisar@redhat.com> - 0.09-1 +- 0.09 bump + +* Thu Oct 27 2011 Petr Pisar <ppisar@redhat.com> - 0.08-1 +- Version 0.08 packaged + + |