[syslog-ng]libol.spec.in patch

Josť Pedro Oliveira syslog-ng@lists.balabit.hu
Thu, 06 May 2004 02:51:39 +0100


This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig0E17760C914E53885B5D7510
Content-Type: multipart/mixed;
 boundary="------------060608070205010708050505"

This is a multi-part message in MIME format.
--------------060608070205010708050505
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit

Bazsi.

The specfile included in libol no longer builds correctly
(it is broken since Red Hat 9, or more correctly, since rpm 4.2).

With the attached patch is builds correctly at least in
RH73, RH9, and Fedora Core 1.

The history of fedora.us libol SRPM can be found here:
https://bugzilla.fedora.us/show_bug.cgi?id=1331

A scsh SRPM can be found here:
https://bugzilla.fedora.us/show_bug.cgi?id=919

Regards,
jpo
-- 
Josť Pedro Oliveira
* mailto: jpo@di.uminho.pt * http://gsd.di.uminho.pt/~jpo *
* gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *

--------------060608070205010708050505
Content-Type: text/plain;
 name="libol.spec.in.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libol.spec.in.patch"

diff -ru libol-0.3.13+20040506-original/libol.spec.in libol-0.3.13+20040506-modified/libol.spec.in
--- libol-0.3.13+20040506-original/libol.spec.in	2003-04-10 15:55:26.000000000 +0100
+++ libol-0.3.13+20040506-modified/libol.spec.in	2004-05-06 02:42:04.000000000 +0100
@@ -1,24 +1,39 @@
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define    with_scheme_preprocessor 0
+
 Summary:   Support library for syslog-ng
 Name:      libol
 Version:   @VERSION@
 Release:   1
+Epoch:     0
 License:   GPL
 Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/%{name}-%{version}.tar.gz
-Packager:  Hollis Blanchard <hollis@penguinppc.org>
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Url:       http://www.balabit.com/products/syslog-ng/
+Source:    http://www.balabit.com/downloads/syslog-ng/libol/0.3/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%if %{with_scheme_preprocessor}
+BuildRequires: scsh
+%endif
 
 %description
 Support library for syslog-ng.
 
+
 %package devel
-Summary: libol headers, libraries
-Group: Development/Libraries
-Requires: %name = %{version}
+Summary:   Support library for syslog-ng: headers and libraries
+Group:     Development/Libraries
+Requires:  %{name} = %{epoch}:%{version}-%{release}
+%if %{with_scheme_preprocessor}
+Requires:  scsh
+%endif
 
 %description devel
-libol headers, libraries
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -26,7 +41,7 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -42,21 +57,31 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
-%{_bindir}/libol-config
-%{_libdir}/libol.so
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
-%{_includedir}/libol
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
+%{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
+%{_libdir}/libol.so
+%{_includedir}/libol
 
 
 %changelog
+* Thu May  6 2004 Jose Pedro Oliveira <jpo@di.uminho.pt> - 0:0.3.13
+- update to version 0.3.13
+- macro %{with_scheme_preprocessor}
+- merged several changes from the fedora.us libol specfile
+
 * Thu Apr 10 2003 Jose Pedro Oliveira <jpo@di.uminho.pt>
 - specfile reformated 
 - replaced hard coded values by RPM macros

--------------060608070205010708050505--

--------------enig0E17760C914E53885B5D7510
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFAmZo1l0metZG9hRsRAuEyAKDbEhxImpmF6LfHZiI40BEnGRR5JgCfTVga
cc2VXyFYyY2msvQtj/QOjBo=
=r2Yb
-----END PGP SIGNATURE-----

--------------enig0E17760C914E53885B5D7510--