From 2bf26bc2319fcdc79f51e6ae8979e2f5a0105043 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:11:49 +0000 Subject: [PATCH 1/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 35c198f..efccccc 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vanessa_logger -# $Id$ +# $Id: Makefile,v 1.1 2009/08/24 19:39:02 kevin Exp $ NAME := vanessa_logger SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4ad6985a563fc44505e8716551125ed290f8e21c Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Sun, 20 Dec 2009 22:15:29 +0000 Subject: [PATCH 2/4] Initial push vanessa_logger into Fedora. --- .cvsignore | 1 + import.log | 1 + sources | 1 + vanessa_logger.spec | 137 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 import.log create mode 100644 vanessa_logger.spec diff --git a/.cvsignore b/.cvsignore index e69de29..a5af62d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +vanessa_logger-0.0.8.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..e7ba16c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vanessa_logger-0_0_8-5_fc11:F-12:vanessa_logger-0.0.8-5.fc11.src.rpm:1261347304 diff --git a/sources b/sources index e69de29..3ee8b40 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +3b70c8b330d25fb97ef9d7f3fd71c0b0 vanessa_logger-0.0.8.tar.bz2 diff --git a/vanessa_logger.spec b/vanessa_logger.spec new file mode 100644 index 0000000..d7e8136 --- /dev/null +++ b/vanessa_logger.spec @@ -0,0 +1,137 @@ +Summary: Generic logging layer +Name: vanessa_logger +Version: 0.0.8 +Release: 5%{?dist} +License: LGPLv2+ +URL: http://www.vergenet.net/linux/vanessa/ +Group: Development/Libraries +Source0: http://www.vergenet.net/linux/vanessa/download/vanessa_logger/%{version}/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) +BuildRequires: automake autoconf libtool +#Patch0: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch + +%description +Generic logging layer that may be used to log to one or more of syslog, +an open file handle or a file name. Though due to limitations in the +implementation of syslog opening multiple syslog loggers doesn't makes +sense. Includes the ability to limit which messages will be logged based +on priorities. + +# As subpackages defined -devel subpackage also must be explicit. +%package devel +Summary: Headers and static libraries for development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Headers and static libraries required to develop against vanessa_logger. + +%package sample +Summary: Example programme that demonstrates vanessa_logger +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description sample +Sample programme with source that demonstrates various features of +vanessa_logger. + + +%prep +%setup -q + +#% patch0 -p0 -b .label + +%build + +# I am providing my own configure macro replacement. Hopefully this +# will result in fewer portability problems than using the one supplied +# by various vendours. I fear that I hope in vein. +CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS +if [ -f configure.in ]; then + aclocal + libtoolize --force --copy + automake --add-missing + autoheader + autoconf +fi +%configure --disable-static + +make + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/%{prefix}/doc +make DESTDIR=%{buildroot} install + +rm -f %{buildroot}%{_libdir}/*.*a + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_libdir}/*.so.* +%doc README COPYING ChangeLog + +%files devel +%defattr(-,root,root,-) +%{_libdir}/*.so +%{_includedir}/*.h +%doc COPYING README + +%files sample +%defattr(-,root,root,-) +%{_bindir}/* +%{_mandir}/man1/vanessa_logger_sample.* +%doc sample/*.c sample/*.h README + +%changelog +* Sun Dec 20 2009 Pavel Alexeev - 0.0.8-5 +- New version 0.0.8 + +* Mon Aug 24 2009 Pavel Alexeev - 0.0.7-4 +- Historical ./configure with huge amount parameters replaced by %%configure macro. +- Removed unnecessary requires /sbin/ldconfig +- Removed the files README,COPYING from the devel package + +* Sun Aug 23 2009 Pavel Alexeev - 0.0.7-3 +- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa) +- vanessa_logger-sample depend on vanessa_logger not on vanessa_logger-devel (thanks to Andrew Colin Kissa) +- Add --add-missing flag to automake command and put it before autoheader. + +* Tue Aug 18 2009 Pavel Alexeev - 0.0.7-2 +- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_logger/vanessa_logger-0.0.6-1.fc8.Hu.1.src.rpm. +- New version 0.0.7 +- Rename spec to classic %%{name}.spec. +- Remove Hu part from release. +- Strip some old comments and unneded commands/macroses. +- Replace $RPM_BUILD_ROOT by %%{buildroot}. +- Move %%doc README COPYING ChangeLog from devel to main package. +- Old BuildPrereq tag replaced by BuildRequires. +- Make setup quiet. +- Adopt patch to new version, and name accordingly: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch. +- Remove *.*a files in %%install. +- License changed to LGPLv2+ from just LGPL according to README. +- Add Requires(postun): /sbin/ldconfig, Requires(post): /sbin/ldconfig, and %%post/%%postun ldconfig invoke. +- Move %%{_libdir}/*.so into -devel. +- Add COPYING also in %%doc of -devel, README in all packages. +- Add --disable-static in configure options (with it .la file not produced). + +* Mon Dec 31 2007 Pavel Alexeev - 0.0.6-1 +- Replace Tag Copyright by License +- Reformat all with tabs +- Change BuildRoot: to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n) +- Delete (Comment out) %%define prefix /usr +- Change from Release: 1 to Release: %%{rel}%%{?dist}.Hu.0 + +* Fri Dec 14 2001 Horms + Revamped configure to use %%{_libdir} and friends. This should be more + distribution indepentant. With thanks to Scot W. Hetzel +* Thu Apr 26 2001 Horms + Updated to "work" with Red Hat 7 +* Sat Sep 15 2000 Horms + created for version 0.0.0 From 102ebe5b005250e7f29b517cab50ed8c7aa98272 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:27:13 +0000 Subject: [PATCH 3/4] Initialize branch EL-6 for vanessa_logger --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 980623c89216a087f33ea56073275e7b7b8b3fc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:53:43 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index efccccc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vanessa_logger -# $Id: Makefile,v 1.1 2009/08/24 19:39:02 kevin Exp $ -NAME := vanessa_logger -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index e7ba16c..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vanessa_logger-0_0_8-5_fc11:F-12:vanessa_logger-0.0.8-5.fc11.src.rpm:1261347304