- updated to 0.4.1, updated sysconfdir patch

- moved base doc to base package, added required COPYING file

Changed files:
    libsmi-sysconfdir.patch -> 1.2
    libsmi.spec -> 1.46

diff --git a/libsmi-sysconfdir.patch b/libsmi-sysconfdir.patch
index 2e4bd257e894e9d95fb6a38ac62a0602d786abba..6fc6b8dbf461bce6c6640dc4c4316c0a811335e9 100644 (file)
--- a/libsmi-sysconfdir.patch
+++ b/libsmi-sysconfdir.patch
@@ -9,14 +9,14 @@
  $HOME/.smirc               user configuration file
  @prefix@/include/smi.h   SMI library header file
  @mibdir@/     SMI module repository directory
---- libsmi-0.3.1/configure.in~ Thu Mar 28 22:28:05 2002
-+++ libsmi-0.3.1/configure.in  Thu Mar 28 22:28:05 2002
+--- libsmi-0.4.1/configure.in~ Thu Mar 28 22:28:05 2002
++++ libsmi-0.4.1/configure.in  Thu Mar 28 22:28:05 2002
 @@ -189,7 +189,7 @@
  AM_PROG_LIBTOOL
  AC_SUBST(LIBTOOL_DEPS)
  
--AC_DEFINE_UNQUOTED(DEFAULT_GLOBALCONFIG, "${prefix}/etc/smi.conf")
-+AC_DEFINE_UNQUOTED(DEFAULT_GLOBALCONFIG, "${sysconfdir}/smi.conf")
- AC_DEFINE(DEFAULT_USERCONFIG, ".smirc")
- 
- if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
+-AC_DEFINE_UNQUOTED([DEFAULT_GLOBALCONFIG], "${prefix}/etc/smi.conf",
++AC_DEFINE_UNQUOTED([DEFAULT_GLOBALCONFIG], "${sysconfdir}/smi.conf",
+ [The full pathname of the global configuration file.])
+
+ AC_DEFINE([DEFAULT_USERCONFIG], ".smirc",

diff --git a/libsmi.spec b/libsmi.spec
index 5bf9352dc276e47d3bfb93bb644e59c106758600..d523adb676708598616d6a74ca14233151e806a2 100644 (file)
--- a/libsmi.spec
+++ b/libsmi.spec
@@ -3,7 +3,7 @@ Summary(pl):    Biblioteka SMI (Struktur zarz
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÄÌÑ ÄÏÓÔÕÐÁ Ë ÉÎÆÏÒÍÁÃÉÉ SMI MIB
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÄÌÑ ÄÏÓÔÕÐÕ ÄÏ ¦ÎÆÏÒÍÁæ§ SMI MIB
 Name:          libsmi
-Version:       0.4.0
+Version:       0.4.1
 Release:       1
 License:       BSD
 Group:         Libraries
@@ -16,8 +16,6 @@ BuildRequires:        automake
 BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr
-
 %description
 Libsmi is a C library that allows network management applications to
 access MIB module information through a well defined API that hides
@@ -149,6 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ANNOUNCE COPYING ChangeLog README THANKS TODO
 %{_sysconfdir}/smi.conf
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_datadir}/mibs
@@ -160,11 +159,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog README THANKS TODO doc/draft-irtf-nmrg-sming-*.txt
+%doc doc/draft-irtf-nmrg-sming-*.txt
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/*
-%{_aclocaldir}/*
+%{_aclocaldir}/*.m4
+%{_pkgconfigdir}/*.pc
 %{_mandir}/man3/*
 
 %files static