packages: libsmbios/libsmbios-sh.patch, libsmbios/libsmbios.spec, libsmbios...

qboosh qboosh at pld-linux.org
Sun Aug 15 07:39:15 CEST 2010


Author: qboosh                       Date: Sun Aug 15 05:39:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.2.26
- updated sh patch, removed obsolete ac patch
- added link patch to avoid *.la poisoning by -L pointing to builddir

---- Files affected:
packages/libsmbios:
   libsmbios-sh.patch (1.1 -> 1.2) , libsmbios.spec (1.9 -> 1.10) , libsmbios-ac.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libsmbios/libsmbios-sh.patch
diff -u packages/libsmbios/libsmbios-sh.patch:1.1 packages/libsmbios/libsmbios-sh.patch:1.2
--- packages/libsmbios/libsmbios-sh.patch:1.1	Wed Jun 18 07:03:51 2008
+++ packages/libsmbios/libsmbios-sh.patch	Sun Aug 15 07:39:10 2010
@@ -1,13 +1,29 @@
---- libsmbios-2.0.2/configure.ac.orig	2008-06-18 06:43:33.290063000 +0200
-+++ libsmbios-2.0.2/configure.ac	2008-06-18 06:42:58.000000000 +0200
-@@ -91,8 +91,8 @@
- for i in RELEASE_NAME RELEASE_MAJOR RELEASE_MINOR RELEASE_SUBLEVEL RELEASE_EXTRALEVEL
- do
-     varname=temp_$i
--    if test -z "${!i}"; then
--        eval $i=${!varname}; export $i
-+    if test -z "$(eval echo \$$i)"; then
-+        eval $i=\$$varname; export $i
-     fi
- done
+--- libsmbios-2.2.26/src/python/Makefile.am.orig	2010-06-24 21:48:29.000000000 +0200
++++ libsmbios-2.2.26/src/python/Makefile.am	2010-08-14 16:23:59.846823295 +0200
+@@ -32,5 +32,5 @@
+ 	cp $< $@
+ 	for var in $(REPLACE_VARS)	;\
+ 	do	\
+-		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|"  $@;\
++		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$$(eval echo \$$$$var)\"|"  $@;\
+ 	done
+--- libsmbios-2.2.26/Makefile-std.orig	2009-06-23 21:08:54.000000000 +0200
++++ libsmbios-2.2.26/Makefile-std	2010-08-14 16:23:26.766824134 +0200
+@@ -45,7 +45,7 @@ install-data-hook:
+ 	    file=$(DESTDIR)/$$i                     ;\
+ 	    for var in $(REPLACE_VARS)	;\
+ 	    do	\
+-	        perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|"  $$file;\
++	        perl -p -i -e "s|^$$var\s*=.*|$$var=\"$$(eval echo \$$$$var)\"|"  $$file;\
+ 	    done	;\
+ 	done
+ 
+@@ -55,7 +55,7 @@ install-exec-hook:
+ 	    file=$(DESTDIR)/$$i                     ;\
+ 	    for var in $(REPLACE_VARS)	;\
+ 	    do	\
+-	        perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|"  $$file;\
++	        perl -p -i -e "s|^$$var\s*=.*|$$var=\"$$(eval echo \$$$$var)\"|"  $$file;\
+ 	    done	;\
+ 	done
  

================================================================
Index: packages/libsmbios/libsmbios.spec
diff -u packages/libsmbios/libsmbios.spec:1.9 packages/libsmbios/libsmbios.spec:1.10
--- packages/libsmbios/libsmbios.spec:1.9	Wed Jun 18 07:05:18 2008
+++ packages/libsmbios/libsmbios.spec	Sun Aug 15 07:39:10 2010
@@ -2,23 +2,25 @@
 Summary:	Open BIOS parsing library
 Summary(pl.UTF-8):	Biblioteka analizująca Open BIOS
 Name:		libsmbios
-Version:	2.0.2
+Version:	2.2.26
 Release:	1
 License:	OSL v2.1 or GPL v2+
 Group:		Libraries
-Source0:	http://linux.dell.com/libsmbios/download/libsmbios/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	3d079038c08495c2a46ec20544168bb4
-Patch0:		%{name}-ac.patch
-Patch1:		%{name}-sh.patch
+Source0:	http://linux.dell.com/libsmbios/download/libsmbios/%{name}-%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	8ae63da74912deffa5b6b2602879c7a9
+Patch0:		%{name}-sh.patch
+Patch1:		%{name}-link.patch
 URL:		http://linux.dell.com/libsmbios/main/index.html
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1.6
 BuildRequires:	cppunit-devel >= 1.9.6
 BuildRequires:	doxygen
+BuildRequires:	gettext-devel >= 0.14
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
-# configure leftover
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	pkgconfig
+BuildRequires:	python >= 2.3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,9 +94,11 @@
 %patch1 -p1
 
 %build
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 CPPFLAGS="-DLIBSMBIOS_ASSERT_CONFIG=1"
 %configure
@@ -107,7 +111,11 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -rf include/smbios $RPM_BUILD_ROOT%{_includedir}
+cp -rf src/include/{smbios,smbios_c} $RPM_BUILD_ROOT%{_includedir}
+
+%py_postclean
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,26 +123,45 @@
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING COPYING-OSL ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libsmbios.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsmbios.so.2
+%attr(755,root,root) %{_libdir}/libsmbios_c.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsmbios_c.so.2
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/dellBiosUpdate-compat
+%attr(755,root,root) %{_sbindir}/dellLEDCtl
+%attr(755,root,root) %{_sbindir}/dellMediaDirectCtl
+%attr(755,root,root) %{_sbindir}/smbios-*
+%dir %{_sysconfdir}/libsmbios
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libsmbios/logging.conf
+%{_datadir}/smbios-utils
+# or %files -n python-libsmbios ?
+%{py_sitescriptdir}/libsmbios_c
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/interface/html
 %attr(755,root,root) %{_libdir}/libsmbios.so
+%attr(755,root,root) %{_libdir}/libsmbios_c.so
 %{_libdir}/libsmbios.la
+%{_libdir}/libsmbios_c.la
 %{_includedir}/smbios
+%{_includedir}/smbios_c
+%{_pkgconfigdir}/libsmbios_c++.pc
+%{_pkgconfigdir}/libsmbios_c.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsmbios.a
+%{_libdir}/libsmbios_c.a
+
+# %files -n yum-*?
+#%{_libdir}/yum-plugins/dellsysid.py*
+#%config(noreplace) %verify(not md5 mtime size) /etc/yum/dellsysid.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -142,6 +169,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/08/15 05:39:10  qboosh
+- updated to 2.2.26
+- updated sh patch, removed obsolete ac patch
+- added link patch to avoid *.la poisoning by -L pointing to builddir
+
 Revision 1.9  2008/06/18 05:05:18  qboosh
 - updated to 2.0.2
 - added ac patch to fix ac 2.6x issue
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libsmbios/libsmbios-sh.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libsmbios/libsmbios.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list