- merged client and server subpackages into main (there's no real reason

  for such split), moved libs to separate one, %files fixes,
- added missing BRs, rel. 1

Changed files:
    usbip.spec -> 1.2

diff --git a/usbip.spec b/usbip.spec
index bedc77549fc7ae353e88713e6a80ac7dff21cfe4..447be1bcfc1010155cbb70f69c6e4ae2f9401ea5 100644 (file)
--- a/usbip.spec
+++ b/usbip.spec
@@ -1,15 +1,20 @@
 Summary:       USB device sharing system over IP network
 Name:          usbip
 Version:       0.1.7
-Release:       0.1
+Release:       1
 License:       GPL v2
-Group:         Applications/System
+Group:         Networking/Utilities
 Source0:       http://dl.sourceforge.net/usbip/%{name}-%{version}.tar.gz
 # Source0-md5: d1094b6d4449787864f8be001639232c
 URL:           http://usbip.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: glib2-devel >= 2.6.0
-BuildRequires: sysfsutils-devel
-BuildRoot:      %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: libtool
+BuildRequires: libwrap-devel
+BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: sysfsutils-devel >= 2.0.0
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The USB/IP Project aims to develop a general USB device sharing system
@@ -31,28 +36,19 @@ were directly attached; for example, we can:
 %package devel
 Summary:       Development files for usbip
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
-The USB/IP Project aims to develop a general USB device sharing system
-over IP network. To share USB devices between computers with their
-full functionality, USB/IP encapsulates "USB requests" into IP packets
-and transmits them between computers. Original USB device drivers and
-applications can be also used for remote USB devices without any
-modification of them. A computer can use remote USB devices as if they
-were directly attached; for example, we can:
- - USB storage devices: fdisk, mkfs, mount/umount, file operations,
-   play a DVD movie and record a DVD-R media.
- - USB keyboards and USB mice: use with linux console and X Window
-   System.
- - USB webcams and USB speakers: view webcam, capture image data and
-   play some music.
- - USB printers, USB scanners, USB serial converters and USB Ethernet
-   interfaces: ok, use fine.
-
 This package contains the libraries and header files needed to develop
 programs which make use of usbip.
 
+%package libs
+Summary:       USB/IP library
+Group:         Libraries
+
+%description libs
+USB over IP library.
+
 %package static
 Summary:       Static usbip library
 Summary(pl.UTF-8):     Statyczna biblioteka usbip
@@ -65,54 +61,6 @@ Static usbip library.
 %description static -l pl.UTF-8
 Statyczna biblioteka usbip.
 
-%package client
-Summary:       USB/IP client utility
-Group:         Networking/Utilities
-Requires:      %{name} = %{version}-%{release}
-
-%description client
-The USB/IP Project aims to develop a general USB device sharing system
-over IP network. To share USB devices between computers with their
-full functionality, USB/IP encapsulates "USB requests" into IP packets
-and transmits them between computers. Original USB device drivers and
-applications can be also used for remote USB devices without any
-modification of them. A computer can use remote USB devices as if they
-were directly attached; for example, we can:
- - USB storage devices: fdisk, mkfs, mount/umount, file operations,
-   play a DVD movie and record a DVD-R media.
- - USB keyboards and USB mice: use with linux console and X Window
-   System.
- - USB webcams and USB speakers: view webcam, capture image data and
-   play some music.
- - USB printers, USB scanners, USB serial converters and USB Ethernet
-   interfaces: ok, use fine.
-
-This package contains USB/IP client utility.
-
-%package server
-Summary:       USB/IP server utils
-Group:         Networking/Daemons
-Requires:      %{name} = %{version}-%{release}
-
-%description server
-The USB/IP Project aims to develop a general USB device sharing system
-over IP network. To share USB devices between computers with their
-full functionality, USB/IP encapsulates "USB requests" into IP packets
-and transmits them between computers. Original USB device drivers and
-applications can be also used for remote USB devices without any
-modification of them. A computer can use remote USB devices as if they
-were directly attached; for example, we can:
- - USB storage devices: fdisk, mkfs, mount/umount, file operations,
-   play a DVD movie and record a DVD-R media.
- - USB keyboards and USB mice: use with linux console and X Window
-   System.
- - USB webcams and USB speakers: view webcam, capture image data and
-   play some music.
- - USB printers, USB scanners, USB serial converters and USB Ethernet
-   interfaces: ok, use fine.
-
-This package contains USB/IP client utils.
-
 %prep
 %setup -q
 
@@ -128,37 +76,36 @@ cd src
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install -C src \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README
-%{_datadir}/%{name}
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*so.0
-
-%files client
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}
-
-%files server
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}d
+%doc src/AUTHORS src/README
 %attr(755,root,root) %{_bindir}/bind_driver
+%attr(755,root,root) %{_bindir}/%{name}*
+%{_datadir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/lib%{name}.so
 %{_includedir}/%{name}
 
+%files libs
+%doc NEWS README
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.0
+
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
-%{_libdir}/lib*.la
+%{_libdir}/lib%{name}.a