[diffmark] 0.09 bump
Petr Pisar
ppisar at fedoraproject.org
Tue Nov 15 12:19:45 UTC 2011
commit 3dabf11515dfdbabbbc59f9795c40322000e4d37
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Nov 15 13:16:26 2011 +0100
0.09 bump
.gitignore | 1 +
diffmark-0.09-remove_rpath.patch | 15 +++++++++++++++
diffmark.spec | 7 +++++--
sources | 2 +-
4 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b7c753..112d8ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/diffmark-0.08.tar.gz
+/diffmark-0.09.tar.gz
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
index 42e06b5..9b94f71 100644
--- a/diffmark.spec
+++ b/diffmark.spec
@@ -1,5 +1,5 @@
Name: diffmark
-Version: 0.08
+Version: 0.09
Release: 1%{?dist}
Summary: XML diff and merge
Group: Applications/Text
@@ -10,7 +10,7 @@ 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.08-remove_rpath.patch
+Patch0: %{name}-0.09-remove_rpath.patch
BuildRequires: libxml2-devel
# Because of diffmark-0.08-remove_rpath.patch:
BuildRequires: autoconf, automake, libtool
@@ -54,6 +54,9 @@ find "$RPM_BUILD_ROOT" -name '*.la' -exec rm -f {} +
%{_libdir}/*.so
%changelog
+* Tue Nov 15 2011 Petr Pisar <ppisar at redhat.com> - 0.09-1
+- 0.09 bump
+
* Thu Oct 27 2011 Petr Pisar <ppisar at redhat.com> - 0.08-1
- Version 0.08 packaged
diff --git a/sources b/sources
index 7e3a594..c3af971 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20154be85ed7d9bceaa106cf70c44a7d diffmark-0.08.tar.gz
+35583bc3c263598bbbfee571ccc62c0d diffmark-0.09.tar.gz
More information about the scm-commits
mailing list