Accepting request 178883 from home:jengelh:branches:Base:System

- Implement shlib packaging guidelines

OBS-URL: https://build.opensuse.org/request/show/178883
OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=26

sg3_utils.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 13 14:15:26 UTC 2013 - jengelh@inai.de
+
+- Implement shlib packaging guidelines; rename sg3_utils-devel
+  to libsgutils-devel (upstream recommendation)
+- More robust make install call; remove redundant %clean section;
+  simplify file lists
+
 -------------------------------------------------------------------
 Tue Jun 11 08:56:39 UTC 2013 - rmilasan@suse.com
 

sg3_utils.spec

@@ -16,21 +16,22 @@
 #
 
 
-Url:            http://sg.danny.cz/sg/sg3_utils.html
-
 Name:           sg3_utils
+%define lname	libsgutils2-2
 Version:        1.36
 Release:        0
 Summary:        A collection of tools that send SCSI commands to devices
 License:        GPL-2.0+ and BSD-3-Clause
 Group:          Hardware/Other
-Source:         http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz
+Url:            http://sg.danny.cz/sg/sg3_utils.html
+
+Source:         http://sg.danny.cz/sg/p/%name-%version.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  xz
 Requires(pre):  %insserv_prereq
 Provides:       scsi
 Provides:       sg_utils
 Obsoletes:      scsi <= 1.7_2.38_1.25_0.19_1.02_0.93
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The sg3_utils package contains utilities that send SCSI commands to
@@ -40,12 +41,12 @@ Parallel Interface(SPI)) many other devices use SCSI command sets.
 ATAPI cd/dvd drives and SATA disks that connect via a translation layer
 or a bridge device are examples of devices that use SCSI command sets.
 
-%package devel
+%package -n %lname
-Summary:        A collection of tools that send SCSI commands to devices
+Summary:        Library to hold functions common to the SCSI utilities
-Group:          Development/Libraries/C and C++
+License:        BSD-3-Clause
-Requires:       %{name} = %{version}
+Group:          System/Libraries
 
-%description devel
+%description -n %lname
 The sg3_utils package contains utilities that send SCSI commands to
 devices. As well as devices on transports traditionally associated with
 SCSI (e.g. Fibre Channel (FCP), Serial Attached SCSI (SAS) and the SCSI
@@ -53,6 +54,29 @@ Parallel Interface(SPI)) many other devices use SCSI command sets.
 ATAPI cd/dvd drives and SATA disks that connect via a translation layer
 or a bridge device are examples of devices that use SCSI command sets.
 
+This subpackage contains the library of common sg_utils code, such as
+SCSI error processing.
+
+%package -n libsgutils-devel
+Summary:        A collection of tools that send SCSI commands to devices
+License:        BSD-3-Clause
+Group:          Development/Libraries/C and C++
+Requires:       %lname = %version
+# Added for 13.1
+Obsoletes:      %name-devel < %version-%release
+Provides:       %name-devel = %version-%release
+
+%description -n libsgutils-devel
+The sg3_utils package contains utilities that send SCSI commands to
+devices. As well as devices on transports traditionally associated with
+SCSI (e.g. Fibre Channel (FCP), Serial Attached SCSI (SAS) and the SCSI
+Parallel Interface(SPI)) many other devices use SCSI command sets.
+ATAPI cd/dvd drives and SATA disks that connect via a translation layer
+or a bridge device are examples of devices that use SCSI command sets.
+
+This subpackage contains libraries and header files for developing
+applications that want to make use of libsgutils.
+
 %prep
 %setup -q
 
@@ -61,57 +85,35 @@ or a bridge device are examples of devices that use SCSI command sets.
 %{__make} %{?_smp_mflags}
 
 %install
-%makeinstall
+make install DESTDIR="%buildroot"
 install -m 755 scripts/scsi_logging_level $RPM_BUILD_ROOT%{_bindir}
 install -m 755 scripts/rescan-scsi-bus.sh $RPM_BUILD_ROOT%{_bindir}
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
+%post   -p /sbin/ldconfig -n %lname
 
-%postun -p /sbin/ldconfig
+%postun -p /sbin/ldconfig -n %lname
 
 %files
 %defattr(-,root,root)
 %doc README README.sg_start 
 %doc ChangeLog CREDITS NEWS
-%attr(755,root,root) %{_bindir}/sg_*
+%_bindir/sg_*
-%attr(755,root,root) %{_bindir}/scsi_*
+%_bindir/scsi_*
-%attr(755,root,root) %{_bindir}/sginfo
+%_bindir/sginfo
-%attr(755,root,root) %{_bindir}/sgp_dd
+%_bindir/sgp_dd
-%attr(755,root,root) %{_bindir}/sgm_dd
+%_bindir/sgm_dd
-%attr(755,root,root) %{_bindir}/scsi_logging_level
+%_bindir/scsi_logging_level
-%attr(755,root,root) %{_bindir}/rescan-scsi-bus.sh
+%_bindir/rescan-scsi-bus.sh
-%doc %{_mandir}/man8/sg_*.8.gz
+%_mandir/man8/*.8*
-%doc %{_mandir}/man8/sgp_dd.8.gz
-%doc %{_mandir}/man8/sgm_dd.8.gz
-%doc %{_mandir}/man8/sginfo.8.gz
-%doc %{_mandir}/man8/sg3_utils.8.gz
-%doc %{_mandir}/man8/scsi_readcap.8.gz
-%doc %{_mandir}/man8/scsi_ready.8.gz
-%doc %{_mandir}/man8/scsi_start.8.gz
-%doc %{_mandir}/man8/scsi_stop.8.gz
-%doc %{_mandir}/man8/scsi_logging_level.8.gz
-%doc %{_mandir}/man8/scsi_mandat.8.gz
-%doc %{_mandir}/man8/scsi_satl.8.gz
-%doc %{_mandir}/man8/scsi_temperature.8.gz
-%attr(755,root,root) %{_libdir}/libsgutils2.so.*
 
-%files devel
+%files -n %lname
-%defattr(644,root,root)
+%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libsgutils2.so
+%_libdir/libsgutils2.so.2*
-%attr(755,root,root) %dir %{_prefix}/include/scsi
-%{_includedir}/scsi/sg_cmds.h
-%{_includedir}/scsi/sg_cmds_basic.h
-%{_includedir}/scsi/sg_cmds_extra.h
-%{_includedir}/scsi/sg_lib.h
-%{_includedir}/scsi/sg_pt.h
-%{_includedir}/scsi/sg_io_linux.h
-%{_includedir}/scsi/sg_linux_inc.h
-%{_includedir}/scsi/sg_cmds_mmc.h
-%{_includedir}/scsi/sg_lib_data.h
 
-%clean
+%files -n libsgutils-devel
-test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
+%defattr(-,root,root)
-rm -rf $RPM_BUILD_DIR/sg3_utils-%{version}
+%_libdir/libsgutils2.so
+%_includedir/scsi/
 
 %changelog