rpms/libol/FC-1 .cvsignore, 1.2, 1.3 libol.spec, 1.2, 1.3 sources, 1.2, 1.3

Jose Pedro Oliveira (jpo) fedora-extras-commits at redhat.com
Tue Mar 8 02:20:35 UTC 2005


Author: jpo

Update of /cvs/extras/rpms/libol/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/FC-1

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/libol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libol.spec	8 Nov 2004 04:47:01 -0000	1.2
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.3
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.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/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# 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:          0.3.15
+Release:          0.fdr.1.1
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%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
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz




More information about the fedora-extras-commits mailing list