From 4137c47e32c862171fabeecbff09a439562881d7 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Thu, 10 Dec 2009 12:49:00 +0000
Subject: [PATCH] Merge Review (#226213) - added url, fixed rpmlint warnings,
 no macros in     changelog

---
 openjade.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/openjade.spec b/openjade.spec
index 22873c7..ed1be94 100644
--- a/openjade.spec
+++ b/openjade.spec
@@ -1,8 +1,9 @@
 Summary: A DSSSL implementation
 Name: openjade
 Version: 1.3.2
-Release: 35%{?dist}
-Prereq: sgml-common >= 0.5
+Release: 36%{?dist}
+Requires: sgml-common
+URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
 Patch1: openjade-1.3.1-nsl.patch
@@ -12,8 +13,11 @@ License: BSD
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: openjade-devel < 1.3.2-17
-Obsoletes: jade
-Provides: jade
+Provides: openjade-devel = %{version}-%{release}
+
+#Last jade version is from Red Hat 6.2
+Obsoletes: jade <= 1.2.1-9
+Provides: jade = %{version}-%{release}
 
 BuildRequires: opensp-devel
 
@@ -45,10 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install install-man DESTDIR=$RPM_BUILD_ROOT
 
-# Fix up libtool libraries
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g"
-
 # oMy, othis ois osilly.
 ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade
 echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc jadedoc/* dsssl/README.jadetex
 %doc README COPYING VERSION
 %ghost /etc/sgml/%{name}-%{version}-%{release}.soc
@@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sgml/%{name}-%{version}
 
 %changelog
+* Thu Dec 10 2009 Ondrej Vasik <ovasik@redhat.com> 1.3.2-36
+- Merge Review (#226213) - added url, fixed rpmlint warnings,
+  no macros in changelog
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -214,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu May 22 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-3
 - Fixes for GCC 3.3.
-- Use --parents for %doc.
+- Use --parents for %%doc.
 
 * Tue Mar 18 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-2
 - Provide sgml2xml man page (bug #83759).