From c13dbbba5f0f1b3c093d03154c1769e3f3d2083e8f3d8bea4200f4c82cbc6715 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 29 Sep 2012 21:26:02 +0000
Subject: [PATCH] Accepting request 136442 from
 home:jengelh:branches:devel:libraries:c_c++

- Remove redundant tags/sections/macros from specfile
- Turn doc subpackage into noarch
- Use crossdistro-friendly install routine

OBS-URL: https://build.opensuse.org/request/show/136442
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/judy?expand=0&rev=2
---
 Judy.changes |  7 +++++++
 Judy.spec    | 32 +++++++++++++++-----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Judy.changes b/Judy.changes
index ebd0ec2..c782f80 100644
--- a/Judy.changes
+++ b/Judy.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 29 21:20:56 UTC 2012 - jengelh@inai.de
+
+- Remove redundant tags/sections/macros from specfile
+- Turn doc subpackage into noarch
+- Use crossdistro-friendly install routine
+
 -------------------------------------------------------------------
 Sat Sep 29 19:40:04 UTC 2012 - dmitry@roshchin.org
 
diff --git a/Judy.spec b/Judy.spec
index 38effa4..0caa5de 100644
--- a/Judy.spec
+++ b/Judy.spec
@@ -16,9 +16,8 @@
 #
 
 Name:           Judy
-%define libname lib%{name}
+%define libname libJudy1
 Version:        1.0.5
-%define somajor 1
 Release:        0
 License:        LGPL-2.1+
 Summary:        A general purpose dynamic array implemented as a C callable library
@@ -29,8 +28,6 @@ Source0:        %{name}-%{version}.tar.bz2
 Patch0:         Judy-test-shared.patch
 
 BuildRequires:  fdupes
-
-Requires:       %{libname}%{somajor} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -45,11 +42,11 @@ only by machine memory. Since Judy is designed as an unbounded array, the size o
 a Judy array is not pre-allocated but grows and shrinks dynamically
 with the array population.
 
-%package -n %{libname}%{somajor}
+%package -n %libname
 Summary:        Dynamic libraries for Judy
 Group:          Development/Libraries/C and C++
 
-%description -n %{libname}%{somajor}
+%description -n %libname
 Judy is a C library that provides a state-of-the-art core technology that implements
 a sparse dynamic array. Judy arrays are declared simply with a null pointer. A Judy
 array consumes memory only when it is populated, yet can grow to take advantage
@@ -64,7 +61,7 @@ with the array population.
 %package devel
 Summary:        Development files for Judy
 Group:          Development/Libraries/C and C++
-Requires:       %{libname}%{somajor} = %{version}
+Requires:       %libname = %version
 Recommends:     %{name}-doc
 
 %description devel
@@ -73,6 +70,9 @@ This package holds the development files for Judy.
 %package doc
 Summary:        Development files for Judy
 Group:          Documentation/Other
+%if 0%{?suse_version} >= 1130 || 0%{?fedora_version}
+BuildArch:	noarch
+%endif
 
 %description doc
 This package contains documentation about Judy library and examples.
@@ -83,13 +83,14 @@ This package contains documentation about Judy library and examples.
 
 %build
 %configure --disable-static
-make
+# not parallel safe
+make -j1
 
 %check
 make check
 
 %install
-%makeinstall
+make install DESTDIR="%buildroot"
 install -dD -m 0755 %{buildroot}%{_docdir}/%{name}
 install -m 0644 \
         AUTHORS COPYING ChangeLog \
@@ -103,22 +104,19 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 
 %fdupes -s %{buildroot}/%{_mandir}
 
-%clean
-rm -rf %{buildroot}
+%post -n %libname -p /sbin/ldconfig
 
-%post -n %{libname}%{somajor} -p /sbin/ldconfig
-
-%postun -n %{libname}%{somajor} -p /sbin/ldconfig
+%postun -n %libname -p /sbin/ldconfig
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}.h
-%{_libdir}/%{libname}.so
+%{_libdir}/libJudy.so
 %{_mandir}/man3/J*
 
-%files -n %{libname}%{somajor}
+%files -n %libname
 %defattr(-,root,root)
-%{_libdir}/%{libname}.so.*
+%{_libdir}/libJudy.so.1*
 
 %files doc
 %defattr(-,root,root)