- pibs/mibs to subpackages

Changed files:
    libsmi.spec -> 1.59

diff --git a/libsmi.spec b/libsmi.spec
index 2b0ae12cb6f21fce565f8464906f6279ed835153..e3ea74a685a26c2d4e4d36ac1f1e1a495ce1e1af 100644 (file)
--- a/libsmi.spec
+++ b/libsmi.spec
@@ -4,7 +4,7 @@ Summary(ru.UTF-8):      Библиотека для доступа к информа
 Summary(uk.UTF-8):     Бібліотека для доступу до інформації SMI MIB
 Name:          libsmi
 Version:       0.4.8
-Release:       1
+Release:       1.5
 License:       BSD
 Group:         Libraries
 Source0:       ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/%{name}-%{version}.tar.gz
@@ -14,6 +14,8 @@ URL:          http://www.ibr.cs.tu-bs.de/projects/libsmi/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+Suggests:      mibs-libsmi
+Suggests:      pibs-libsmi
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,6 +58,36 @@ SMI tools.
 %description progs -l pl.UTF-8
 Narzędzia SMI.
 
+%package -n mibs-dirs
+Summary:       Common directories for MIBs
+Group:         Base
+
+%description -n mibs-dirs
+Common directories for MIBs (Management Information Base).
+
+%package -n pibs-dirs
+Summary:       LibSMI provided PIBs
+Group:         Base
+
+%description -n pibs-dirs
+Common directories for PIBs (Policy Information Base).
+
+%package -n mibs-libsmi
+Summary:       LibSMI provided MIBs
+Group:         Base
+Requires:      mibs-dirs
+
+%description -n mibs-libsmi
+LibSMI provided MIBs (Management Information Base).
+
+%package -n pibs-libsmi
+Summary:       LibSMI provided PIBs
+Group:         Base
+Requires:      pibs-dirs
+
+%description -n pibs-libsmi
+LibSMI provided PIBs (Policy Information Base).
+
 %package devel
 Summary:       Header files and development documentation for libsmi
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja do libsmi
@@ -79,9 +111,9 @@ Pliki nagłówkowe i dokumentacja do libsmi.
 %package static
 Summary:       Static libsmi libraries
 Summary(pl.UTF-8):     Biblioteki statyczne libsmi
-Group:         Development/Libraries
 Summary(ru.UTF-8):     Статические библиотеки для разработки программ с использованием libsmi
 Summary(uk.UTF-8):     Статичні бібліотеки для розробки програм з використанням libsmi
+Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
@@ -100,6 +132,8 @@ libsmi.
 %prep
 %setup -q
 
+find '(' -name '*~' -o -name '*.orig' -o -name '*-orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -122,7 +156,11 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/smi.conf
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,17 +171,55 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ANNOUNCE COPYING ChangeLog README THANKS TODO
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/smi.conf
 %attr(755,root,root) %{_libdir}/libsmi.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsmi.so.2
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/smi.conf
-%{_datadir}/mibs
-%{_datadir}/pibs
 
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/smi*
 %{_mandir}/man1/smi*.1*
 
+%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/*
+
+%files -n pibs-libsmi
+%defattr(644,root,root,755)
+%{_datadir}/pibs/COPS-PR-SPPI*
+%{_datadir}/pibs/*-PIB
+
 %files devel
 %defattr(644,root,root,755)
 %doc doc/draft-irtf-nmrg-smi*.txt