packages: libsmi/libsmi.spec, libsmi/flat-mibdir.patch (NEW) - simplify by ...

Mon Dec 28 12:58:57 CET 2009

Author: glen                         Date: Mon Dec 28 11:58:57 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify by installing mibs/pibs flat

---- Files affected:
packages/libsmi:
   libsmi.spec (1.59 -> 1.60) , flat-mibdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libsmi/libsmi.spec
diff -u packages/libsmi/libsmi.spec:1.59 packages/libsmi/libsmi.spec:1.60

--- packages/libsmi/libsmi.spec:1.59	Mon Dec 28 12:06:15 2009
+++ packages/libsmi/libsmi.spec	Mon Dec 28 12:58:52 2009
@@ -5,12 +5,13 @@
 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
@@ -132,6 +133,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 find '(' -name '*~' -o -name '*.orig' -o -name '*-orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -146,7 +148,9 @@
 	--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}
 
@@ -160,8 +164,8 @@
 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
@@ -184,42 +188,20 @@
 %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)
@@ -242,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2009/12/28 11:58:52  glen
+- simplify by installing mibs/pibs flat
+
 Revision 1.59  2009/12/28 11:06:15  glen
 - pibs/mibs to subpackages
 

================================================================
Index: packages/libsmi/flat-mibdir.patch
diff -u /dev/null packages/libsmi/flat-mibdir.patch:1.1
--- /dev/null	Mon Dec 28 12:58:57 2009
+++ packages/libsmi/flat-mibdir.patch	Mon Dec 28 12:58:52 2009
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libsmi/libsmi.spec?r1=1.59&r2=1.60&f=u

