diff --git a/libsmi-0.4.5-gnu-source.patch b/libsmi-0.4.5-gnu-source.patch deleted file mode 100644 index 2472b4c..0000000 --- a/libsmi-0.4.5-gnu-source.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/smi.c -=================================================================== ---- lib/smi.c.orig 2005-11-25 10:14:05.000000000 +0100 -+++ lib/smi.c 2009-01-09 02:55:36.000000000 +0100 -@@ -10,7 +10,7 @@ - * - * @(#) $Id: smi.c 2128 2005-04-25 22:36:46Z schoenw $ - */ -- -+#define _GNU_SOURCE - #include - - #include diff --git a/libsmi-0.4.5-no_redef.diff b/libsmi-0.4.5-no_redef.diff deleted file mode 100644 index d174880..0000000 --- a/libsmi-0.4.5-no_redef.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- lib/snprintf.h -+++ lib/snprintf.h -@@ -45,12 +45,20 @@ - extern int vsnprintf (char *str, size_t sz, const char *format, va_list args); - #endif - -+#ifndef HAVE_ASPRINTF - extern int asprintf (char **ret, const char *format, ...); -+#endif - -+#ifndef HAVE_ASNPRINTF - extern int asnprintf (char **ret, size_t max_sz, const char *format, ...); -+#endif - -+#ifndef HAVE_VASPRINTF - extern int vasprintf (char **ret, const char *format, va_list args); -+#endif - -+#ifndef HAVE_VSNPRINTF - extern int vasnprintf (char **ret, size_t max_sz, const char *format, - va_list args); -+#endif - diff --git a/libsmi-0.4.5.tar.bz2 b/libsmi-0.4.5.tar.bz2 deleted file mode 100644 index cf0373e..0000000 --- a/libsmi-0.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba37e8b2951000bb105abb7326bb92188311d25e19b7eadaa3fe4cceff6d4f5f -size 2565350 diff --git a/libsmi-0.4.8-gnu-source.patch b/libsmi-0.4.8-gnu-source.patch new file mode 100644 index 0000000..69db81e --- /dev/null +++ b/libsmi-0.4.8-gnu-source.patch @@ -0,0 +1,11 @@ +diff -uNr libsmi-0.4.8-orig/lib/smi.c libsmi-0.4.8/lib/smi.c +--- libsmi-0.4.8-orig/lib/smi.c 2008-04-18 12:42:50.000000000 +0200 ++++ libsmi-0.4.8/lib/smi.c 2010-03-23 10:51:12.373123639 +0100 +@@ -11,6 +11,7 @@ + * @(#) $Id: smi.c 8071 2008-04-17 11:14:46Z schoenw $ + */ + ++#define _GNU_SOURCE + #include + + #include diff --git a/libsmi-0.4.8-parser.patch b/libsmi-0.4.8-parser.patch new file mode 100644 index 0000000..bac92e1 --- /dev/null +++ b/libsmi-0.4.8-parser.patch @@ -0,0 +1,14 @@ +diff -uNr libsmi-0.4.8-orig/lib/parser-sming.y libsmi-0.4.8/lib/parser-sming.y +--- libsmi-0.4.8-orig/lib/parser-sming.y 2008-04-18 12:42:50.000000000 +0200 ++++ libsmi-0.4.8/lib/parser-sming.y 2010-03-23 10:44:11.777122974 +0100 +@@ -2161,8 +2161,8 @@ + classPtr, thisParserPtr); + setAttributeParentType($$, smiHandle->typeBitsPtr); + if ($1) { +- setAttributeList($$, $1); +- for (p = $1; p; p = p->nextPtr) ++ setAttributeList($$, (void *)$1); ++ for (p = (void *)$1; p; p = (void *)p->nextPtr) + ((NamedNumber *)(p->ptr))->typePtr = (Type*)$$; + } + diff --git a/libsmi-0.4.8.tar.gz b/libsmi-0.4.8.tar.gz new file mode 100644 index 0000000..cf2d0db --- /dev/null +++ b/libsmi-0.4.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849 +size 4104111 diff --git a/libsmi.changes b/libsmi.changes index 6441cfb..3bae12d 100644 --- a/libsmi.changes +++ b/libsmi.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Mar 29 14:26:21 CEST 2010 - boris@steki.net + +- Created subpackage libsmi2 to make rpmlint happy + +------------------------------------------------------------------- +Sat Mar 27 13:51:22 CET 2010 - boris@steki.net + +- update to 0.4.8 + * test/*: updated a couple of checks. + * tools/*: fixed a couple of minor compiler warnings. + * new MIBs + * tools/Makefile.am: added missing files to the distribution. +- patch for cast correction in parser-sming.y +- require of bison and flex in spec so build will rebuild parsers + ------------------------------------------------------------------- Fri Jan 9 03:02:57 CET 2009 - crrodriguez@suse.de diff --git a/libsmi.spec b/libsmi.spec index 3f63a3a..5c6ea0a 100644 --- a/libsmi.spec +++ b/libsmi.spec @@ -1,7 +1,7 @@ # -# spec file for package libsmi (Version 0.4.5) +# spec file for package libsmi (Version 0.4.8) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,20 @@ Name: libsmi -BuildRequires: wget -Version: 0.4.5 -Release: 125 +Version: 0.4.8 +Release: 1 AutoReqProv: on Group: System/Libraries -License: X11/MIT +License: MIT Url: http://www.ibr.cs.tu-bs.de/projects/libsmi Summary: A Library to Access SMI MIB Information -Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-no_redef.diff -Patch1: libsmi-0.4.5-gnu-source.patch +Source: %{name}-%{version}.tar.gz +Patch0: libsmi-0.4.8-parser.patch +Patch1: libsmi-0.4.8-gnu-source.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: bison flex + %description The purpose of libsmi is to @@ -51,11 +52,35 @@ Authors: Frank Strauss %package devel -License: X11/MIT -Summary: libsmi header files and static libraries +License: MIT +Summary: Libsmi Header Files And Static Libraries Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glibc-devel +%package -n libsmi2 +License: MIT +Group: System/Libraries +Summary: Libsmi Shared Libraries +Requires: %{name} = %{version} + +%description -n libsmi2 +The purpose of libsmi is to + +* Give network management applications a concise programmer-friendly + interface to access MIB module information + +* Separate the knowledge on SMI from the main parts of management + applications + +* Allow addition of new kinds of MIB repositories without the need to +adapt applications that make use of libsmi + + + +Authors: +-------- + Frank Strauss + %description devel This package contains the header files and static libraries of package libsmi. @@ -68,23 +93,25 @@ Authors: %prep %setup -q -%patch0 -%patch1 +%patch0 -p1 +%patch1 -p1 %build autoreconf --force --install %configure --disable-static --with-pic --enable-smi \ --enable-sming \ --with-mibdir=%{_datadir}/mibs + %{__make} %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +make install DESTDIR=%buildroot + %{__rm} -f %{buildroot}%{_libdir}/*.la -%post -p /sbin/ldconfig +%post -n libsmi2 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libsmi2 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -93,11 +120,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %doc ANNOUNCE COPYING ChangeLog README THANKS TODO doc/*.txt %doc %{_mandir}/man?/* -%{_libdir}/libsmi.so.* %{_bindir}/* %{_datadir}/mibs %{_datadir}/pibs +%files -n libsmi2 +%defattr(-, root, root) +%{_libdir}/libsmi.so.* + %files devel %defattr(-, root, root) %{_includedir}/* @@ -106,66 +136,3 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libsmi.m4 %changelog -* Fri Jan 09 2009 crrodriguez@suse.de -- remove static libraries and "la" files -- remove deprecated run_ldconfig usage -- define _GNU_SOURCE where needed -* Wed Oct 18 2006 mjancar@suse.cz -- update to 0.4.5 - * bugfixes - * new MIBs -- drop libsmi-0.4.5-sysconf.diff, included upstream -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jun 13 2005 ro@suse.de -- do not redefine vsnprintf -* Thu Feb 24 2005 mjancar@suse.cz -- update to 0.4.3 -* Fri Feb 27 2004 mjancar@suse.cz -- update to 0.4.2 -* Sat Jan 10 2004 adrian@suse.de -- build as user -* Thu Jul 31 2003 mjancar@suse.cz -- use %%run_ldconfig -* Thu May 29 2003 mjancar@suse.cz -- update to 0.4.1 -* Wed May 28 2003 coolo@suse.de -- add the aclocal macro file to the devel package -* Fri May 09 2003 ro@suse.de -- do a full autoreconf -* Tue Jan 29 2002 cihlar@suse.cz -- use %%{_libdir} -* Mon Nov 26 2001 cihlar@suse.cz -- update to version 0.3.0: - * many fixes - * added several files to mibs/... by new RFCs -- devel subpackage created -* Mon Nov 12 2001 cihlar@suse.cz -- fixed installation with new automake -* Wed Jun 06 2001 cihlar@suse.cz -- fixed to compile with new libtool -* Tue Apr 17 2001 cihlar@suse.cz -- update to version 0.2.16 -* Wed Mar 07 2001 cihlar@suse.cz -- update to version 0.2.14 -* Tue Feb 27 2001 cihlar@suse.cz -- update to version 0.2.13 -- compile with --enable-smi and --enable-sming -* Sun Dec 03 2000 smid@suse.cz -- new version 0.2.11 -* Wed Oct 11 2000 smid@suse.cz -- new version 0.2.6 -* Thu Jun 08 2000 cihlar@suse.cz -- fixed License tag -- added %%clean -* Fri Apr 21 2000 smid@suse.cz -- upgrade to 0.2.0 -- buildroot added -* Sat Apr 08 2000 bk@suse.de -- added suse update config macro -* Thu Mar 02 2000 uli@suse.de -- moved man pages to %%{_mandir} -* Mon Oct 25 1999 uli@suse.de -- update -> 0.1.7 -* Mon Sep 27 1999 uli@suse.de -- new package, version 0.1.6