[diffmark] Import
Petr Pisar
ppisar at fedoraproject.org
Fri Nov 4 08:30:33 UTC 2011
commit 1a1310569e8b1797cae859f1df6ea4cec42f5042
Author: Petr Písař <ppisar at redhat.com>
Date: Fri Nov 4 09:23:20 2011 +0100
Import
.gitignore | 1 +
.rpmlint | 2 +
diffmark-0.08-remove_rpath.patch | 15 +++++++++
diffmark.spec | 60 ++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 79 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..5b7c753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/diffmark-0.08.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..9fe83d3
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error .* dm");
diff --git a/diffmark-0.08-remove_rpath.patch b/diffmark-0.08-remove_rpath.patch
new file mode 100644
index 0000000..9c3bdbc
--- /dev/null
+++ b/diffmark-0.08-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 -lxml2 -lstdc++
++libdiffmark_la_LDFLAGS = -version-info 2:3:1 -lxml2 -lstdc++
+
diff --git a/diffmark.spec b/diffmark.spec
new file mode 100644
index 0000000..42e06b5
--- /dev/null
+++ b/diffmark.spec
@@ -0,0 +1,60 @@
+Name: diffmark
+Version: 0.08
+Release: 1%{?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.08-remove_rpath.patch
+BuildRequires: libxml2-devel
+# Because of diffmark-0.08-remove_rpath.patch:
+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
+libtoolize --force && autoreconf
+
+%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
+* Thu Oct 27 2011 Petr Pisar <ppisar at redhat.com> - 0.08-1
+- Version 0.08 packaged
+
+
diff --git a/sources b/sources
index e69de29..7e3a594 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+20154be85ed7d9bceaa106cf70c44a7d diffmark-0.08.tar.gz
More information about the scm-commits
mailing list