rpms/libol/FC-3 .cvsignore, 1.2, 1.3 libol.spec, 1.4, 1.5 sources, 1.2, 1.3

Jose Pedro Oliveira (jpo) fedora-extras-commits at redhat.com
Tue Mar 1 21:09:27 UTC 2005


Author: jpo

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

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Update to 0.3.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/.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	1 Mar 2005 21:09:25 -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-3/libol.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libol.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libol.spec	1 Mar 2005 21:09:25 -0000	1.5
@@ -1,31 +1,35 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   2
-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
+
+Name:           libol
+Version:        0.3.15
+Release:        2
+Epoch:          0
+Summary:        Support library for syslog-ng
+
+Group:          Development/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
 
 %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 +37,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 +53,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,32 +73,43 @@
 
 
 %changelog
-* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
+* Tue Mar 01 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.15-2
+- Remove redundant explicit /sbin/ldconfig dependency.
+
+* 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"
 
-* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
+* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
 - removed blockers listed in the first comment of bugzilla entry 1331
 - https://bugzilla.fedora.us/show_bug.cgi?id=1331
 
-* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
+* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
 - updated to version 0.3.13
 
-* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
+* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
 - make %{?_smp_mflags}
 
-* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
+* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
 - moved files libol-config and libol.so into the devel RPM
 
-* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
+* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
 - first spec for fedora.us
 
-* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - updated to version 0.3.11
 
-* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
  
-* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - specfile reformated 
 - replaced hard coded values by RPM macros
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/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	1 Mar 2005 21:09:25 -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