- simplify by installing mibs/pibs flat

Changed files:
    flat-mibdir.patch -> 1.1
    libsmi.spec -> 1.60

diff --git a/flat-mibdir.patch b/flat-mibdir.patch
new file mode 100644 (file)
index 0000000..296e799
--- /dev/null
+++ b/flat-mibdir.patch
@@ -0,0 +1,66 @@
+--- libsmi-0.4.8/mibs/iana/Makefile.am~        2007-03-05 16:59:31.000000000 +0200
++++ libsmi-0.4.8/mibs/iana/Makefile.am 2009-12-28 13:08:46.722764909 +0200
+@@ -11,7 +11,7 @@
+ # @(#) $Id$
+ #
+ 
+-ianadir                       = $(mibdir)/iana
++ianadir                       = $(mibdir)
+ MIBS                  = $(shell ls -1 $(srcdir) | egrep -v 'CVS|Makefile')
+ EXTRA_DIST            = $(MIBS)
+ iana_DATA             = $(MIBS)
+--- libsmi-0.4.8/mibs/ietf/Makefile.am~        2005-11-25 11:13:42.000000000 +0200
++++ libsmi-0.4.8/mibs/ietf/Makefile.am 2009-12-28 13:08:58.476097215 +0200
+@@ -11,7 +11,7 @@
+ # @(#) $Id$
+ #
+ 
+-ietfdir                       = $(mibdir)/ietf
++ietfdir                       = $(mibdir)
+ MIBS                  = $(shell ls -1 $(srcdir) | egrep -v 'CVS|Makefile')
+ EXTRA_DIST              = $(MIBS)
+ ietf_DATA             = $(MIBS)
+--- libsmi-0.4.8/mibs/site/Makefile.am~        2005-11-25 11:13:25.000000000 +0200
++++ libsmi-0.4.8/mibs/site/Makefile.am 2009-12-28 13:09:17.119221119 +0200
+@@ -11,7 +11,7 @@
+ # @(#) $Id$
+ #
+ 
+-sitedir                       = $(mibdir)/site
++sitedir                       = $(mibdir)
+ MIBS                  = $(shell ls -1 $(srcdir) | egrep -v 'CVS|Makefile')
+ EXTRA_DIST              = $(MIBS)
+ site_DATA             = $(MIBS)
+--- libsmi-0.4.8/mibs/tubs/Makefile.am~        2005-11-25 11:13:49.000000000 +0200
++++ libsmi-0.4.8/mibs/tubs/Makefile.am 2009-12-28 13:09:30.755886732 +0200
+@@ -11,7 +11,7 @@
+ # @(#) $Id$
+ #
+ 
+-tubsdir                       = $(mibdir)/tubs
++tubsdir                       = $(mibdir)
+ MIBS                  = $(shell ls -1 $(srcdir) | egrep -v 'CVS|Makefile')
+ EXTRA_DIST              = $(MIBS)
+ tubs_DATA             = $(MIBS)
+--- libsmi-0.4.8/mibs/irtf/Makefile.am~        2005-11-25 11:13:24.000000000 +0200
++++ libsmi-0.4.8/mibs/irtf/Makefile.am 2009-12-28 13:12:48.902601414 +0200
+@@ -11,7 +11,7 @@
+ # @(#) $Id$
+ #
+ 
+-irtfdir                       = $(mibdir)/irtf
++irtfdir                       = $(mibdir)
+ MIBS                  = $(shell ls -1 $(srcdir) | egrep -v 'CVS|Makefile')
+ EXTRA_DIST              = $(MIBS)
+ irtf_DATA             = $(MIBS)
+--- libsmi-0.4.8/pibs/Makefile.am~     2005-11-25 11:13:54.000000000 +0200
++++ libsmi-0.4.8/pibs/Makefile.am      2009-12-28 13:13:56.989192666 +0200
+@@ -16,8 +16,3 @@
+ PIBS                  = $(shell ls -1d [a-z]*/* | egrep -v 'CVS|Makefile')
+ pib_DATA              = $(PIBS)
+ SUBDIRS                       = $(PIBDIRS)
+-
+-install-exec-local:
+-      for dir in $(PIBDIRS) ; do \
+-              $(mkinstalldirs) $(DESTDIR)$(pibdir)/$$dir ; \
+-      done

diff --git a/libsmi.spec b/libsmi.spec
index e3ea74a685a26c2d4e4d36ac1f1e1a495ce1e1af..b1e9be9e28c555ee2b873739458a3280e915522b 100644 (file)
--- a/libsmi.spec
+++ b/libsmi.spec
@@ -4,12 +4,13 @@ Summary(ru.UTF-8):    Библиотека для доступа к информа
 Summary(uk.UTF-8):     Бібліотека для доступу до інформації SMI MIB
 Name:          libsmi
 Version:       0.4.8
-Release:       1.5
+Release:       1.6
 License:       BSD
 Group:         Libraries
 Source0:       ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/%{name}-%{version}.tar.gz
 # Source0-md5: 760b6b1070738158708649ed2c63425e
 Source1:       %{name}-smi.conf
+Patch0:                flat-mibdir.patch
 URL:           http://www.ibr.cs.tu-bs.de/projects/libsmi/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -131,6 +132,7 @@ libsmi.
 
 %prep
 %setup -q
+%patch0 -p1
 
 find '(' -name '*~' -o -name '*.orig' -o -name '*-orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -145,7 +147,9 @@ find '(' -name '*~' -o -name '*.orig' -o -name '*-orig' ')' -print0 | xargs -0 -
        --enable-sming \
        --enable-shared \
        --enable-static \
-       --with-mibdir=%{_datadir}/mibs
+       --with-mibdir=%{_datadir}/mibs \
+       --with-pibdir=%{_datadir}/pibs \
+       --with-smipath=%{_datadir}/mibs:%{_datadir}/pibs
 
 %{__make}
 
@@ -159,8 +163,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/smi.conf
 
 # .index files produced by net-snmp
-touch $RPM_BUILD_ROOT%{_datadir}/mibs/{,iana,ietf,irtf,site,tubs}/.index
-touch $RPM_BUILD_ROOT%{_datadir}/pibs/{,ietf,site,tubs}/.index
+touch $RPM_BUILD_ROOT%{_datadir}/mibs/.index
+touch $RPM_BUILD_ROOT%{_datadir}/pibs/.index
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -183,42 +187,20 @@ rm -rf $RPM_BUILD_ROOT
 %files -n mibs-dirs
 %defattr(644,root,root,755)
 %dir %{_datadir}/mibs
-%dir %{_datadir}/mibs/iana
-%dir %{_datadir}/mibs/ietf
-%dir %{_datadir}/mibs/irtf
-%dir %{_datadir}/mibs/site
-%dir %{_datadir}/mibs/tubs
-
 %ghost %{_datadir}/mibs/.index
-%ghost %{_datadir}/mibs/iana/.index
-%ghost %{_datadir}/mibs/ietf/.index
-%ghost %{_datadir}/mibs/irtf/.index
-%ghost %{_datadir}/mibs/site/.index
-%ghost %{_datadir}/mibs/tubs/.index
 
 %files -n pibs-dirs
 %defattr(644,root,root,755)
 %dir %{_datadir}/pibs
-%dir %{_datadir}/pibs/ietf
-%dir %{_datadir}/pibs/site
-%dir %{_datadir}/pibs/tubs
-
 %ghost %{_datadir}/pibs/.index
-%ghost %{_datadir}/pibs/ietf/.index
-%ghost %{_datadir}/pibs/site/.index
-%ghost %{_datadir}/pibs/tubs/.index
 
 %files -n mibs-libsmi
 %defattr(644,root,root,755)
-%{_datadir}/mibs/iana/*
-%{_datadir}/mibs/ietf/*
-%{_datadir}/mibs/irtf/*
-%{_datadir}/mibs/tubs/*
+%{_datadir}/mibs/*
 
 %files -n pibs-libsmi
 %defattr(644,root,root,755)
-%{_datadir}/pibs/COPS-PR-SPPI*
-%{_datadir}/pibs/*-PIB
+%{_datadir}/pibs/*
 
 %files devel
 %defattr(644,root,root,755)