rpms/libsmbios/devel .cvsignore, 1.12, 1.13 libsmbios.spec, 1.15, 1.16 sources, 1.12, 1.13

Sat Jan 17 06:07:20 UTC 2009

Author: mebrown

Update of /cvs/extras/rpms/libsmbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5818

Modified Files:
	.cvsignore libsmbios.spec sources 
Log Message:
* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.8-1
- revert change in upstream renaming rpm to libsmbios2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13

--- .cvsignore	16 Jan 2009 02:11:06 -0000	1.12
+++ .cvsignore	17 Jan 2009 06:06:50 -0000	1.13
@@ -1 +1 @@
-libsmbios-2.2.7.tar.bz2
+libsmbios-2.2.8.tar.bz2


Index: libsmbios.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libsmbios.spec	16 Jan 2009 02:11:06 -0000	1.15
+++ libsmbios.spec	17 Jan 2009 06:06:50 -0000	1.16
@@ -3,11 +3,20 @@
 # these are all substituted by autoconf
 %define major 2
 %define minor 2
-%define micro 7
+%define micro 8
 %define extra %{nil}
-%define lang_dom  libsmbios2-2.2
+%define lang_dom  libsmbios-2.2
 %define release_version %{major}.%{minor}.%{micro}%{extra}
 
+%define release_name libsmbios
+%define other_name   libsmbios2
+
+# suse naming conventions
+%if 0%{?suse_version}
+%define release_name libsmbios2
+%define other_name   libsmbios
+%endif
+
 # required by suse build system
 # norootforbuild
 
@@ -54,21 +63,21 @@
 # fedora: use the !? code below to define when it isnt already
 %{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name: libsmbios2
+Name: %{release_name}
 Version: %{release_version}
 Release: 1%{?dist}
 License: GPLv2+ or OSL 2.1
 Summary: Libsmbios C/C++ shared libraries
 Group: System Environment/Libraries
-Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2
+Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.gz
 URL: http://linux.dell.com/libsmbios/main
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: strace libxml2-devel python-devel gcc-c++ gettext valgrind doxygen %{cppunit_BR} %{fdupes_BR}
-Provides: libsmbios-libs = 0:%{version}-%{release}
 # uncomment for official fedora
-#Obsoletes: libsmbios-libs < 2.0.0
-Obsoletes: libsmbios < 0:%{version}-%{release}
-Provides: libsmbios = 0:%{version}-%{release}
+Obsoletes: libsmbios-libs < 2.0.0
+Provides: libsmbios-libs = 0:%{version}-%{release}
+Obsoletes: %{other_name} <= 0:%{version}-%{release}
+Provides: %{other_name}  0:%{version}-%{release}
 
 # libsmbios only ever makes sense on intel compatible arches
 # no DMI tables on ppc, s390, etc.
@@ -88,7 +97,7 @@
 %package -n python-smbios
 Summary: Python interface to Libsmbios C library
 Group: System Environment/Libraries
-Requires: libsmbios2 = %{version}-%{release}
+Requires: %{release_name} = 0:%{version}-%{release}
 Requires: python %{ctypes_BR}
 
 %description -n python-smbios
@@ -110,7 +119,7 @@
 %package -n smbios-utils-bin
 Summary: Binary utilities that use libsmbios
 Group: Applications/System
-Requires: libsmbios2 = %{version}-%{release}
+Requires: %{release_name} = 0:%{version}-%{release}
 
 %description -n smbios-utils-bin
 Get BIOS information, such as System product name, product id, service tag and
@@ -127,14 +136,15 @@
 cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems.
 Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
 
-%package -n libsmbios2-devel
+# name the devel package libsmbios-devel regardless of package name, per suse/fedora convention
+%package -n libsmbios-devel
 Summary: Development headers and archives
 Group: Development/Libraries
-Requires: libsmbios = %{version}-%{release}
-Provides: libsmbios-devel = %{version}-%{release}
-Obsoletes: libsmbios-devel < %{version}-%{release}
+Requires: %{release_name} = 0:%{version}-%{release}
+Provides: libsmbios2-devel = %{version}-%{release}
+Obsoletes: libsmbios2-devel < %{version}-%{release}
 
-%description -n libsmbios2-devel
+%description -n libsmbios-devel
 Libsmbios is a library and utilities that can be used by client programs to get
 information from standard BIOS tables, such as the SMBIOS table.
 
@@ -157,7 +167,10 @@
 echo '../configure "$@"' > configure
 chmod +x ./configure
 
-%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+%configure \
+    --disable-static    \
+    RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra} \
+    CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
 mkdir -p out/libsmbios_c
 mkdir -p out/libsmbios_c++
 make -e %{?_smp_mflags} 2>&1 | tee build.log
@@ -204,7 +217,7 @@
 mkdir -p %{buildroot}/usr/include
 cp -a $TOPDIR/src/include/*  %{buildroot}/usr/include/
 rm -f %{buildroot}/%{_libdir}/lib*.la
-find %{buildroot}/usr/include -exec touch -r $TOPDIR/configure.ac {} \;
+find %{buildroot}/usr/include out/libsmbios_c++ out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;
 
 # backwards compatible:
 ln -s ../sbin/dellWirelessCtl %{buildroot}/usr/bin/dellWirelessCtl
@@ -221,10 +234,10 @@
 %clean
 rm -rf %{buildroot}
 
-%post   -n libsmbios2   -p /sbin/ldconfig
-%postun -n libsmbios2   -p /sbin/ldconfig
+%post   -n %{release_name}   -p /sbin/ldconfig
+%postun -n %{release_name}   -p /sbin/ldconfig
 
-%files -n libsmbios2 -f _build/%{lang_dom}.lang
+%files -n %{release_name} -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
 %{_libdir}/libsmbios_c.so.*
 %{_libdir}/libsmbios.so.*
@@ -234,14 +247,12 @@
 %doc COPYING-GPL COPYING-OSL README
 %{py_sitedir}/*
 
-%files -n libsmbios2-devel -f _build/buildlogs.txt
+%files -n libsmbios-devel -f _build/buildlogs.txt
 %defattr(-,root,root,-)
 %doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
 /usr/include/smbios
 /usr/include/smbios_c
-%{_libdir}/libsmbios.a
 %{_libdir}/libsmbios.so
-%{_libdir}/libsmbios_c.a
 %{_libdir}/libsmbios_c.so
 %doc _build/out/libsmbios_c++
 %doc _build/out/libsmbios_c
@@ -312,6 +323,9 @@
 %{_datadir}/smbios-utils
 
 %changelog
+* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.8-1
+- revert change in upstream renaming rpm to libsmbios2
+
 * Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.7-1
 - change source to bz2 format
 - Update to latest upstream release. Many changes in the new release:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Jan 2009 02:11:06 -0000	1.12
+++ sources	17 Jan 2009 06:06:50 -0000	1.13
@@ -1 +1 @@
-6a016ca6223fd98bda04fca514bb63d4  libsmbios-2.2.7.tar.bz2
+063418dc6ff5137373c6cf9022ec3622  libsmbios-2.2.8.tar.bz2


