Browse Source

update: STLport, lm-sensors

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2348 ec354946-7b23-47d6-9f5a-488ba84defc7
owa 11 years ago
parent
commit
156d107649
2 changed files with 43 additions and 39 deletions
  1. 36 35
      S/STLport/STLport-vl.spec
  2. 7 4
      l/lm-sensors/lm-sensors-vl.spec

+ 36 - 35
S/STLport/STLport-vl.spec

@@ -1,6 +1,6 @@
 Name:         STLport
-Version:      5.1.5
-Release:      2%{?_dist_release}
+Version:      5.2.1
+Release:      1%{?_dist_release}
 Summary:      C++ STL library compatible with the latest ANSI/ISO C++ specification
 Summary(ja):  ANSI/ISO C++ 仕様に沿った C++ 標準テンプレートライブラリ
 Group:        System Environment/Libraries
@@ -32,61 +32,62 @@ Documentarion and headers for STLport
 %prep
 %setup -q
 
+
 %build
-#cd src
-#make -f gcc.mak INSTALLDIR=$RPM_BUILD_ROOT%{_prefix} clean all
+./configure \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--libdir=%{_libdir} \
+	--includedir=%{_includedir} \
+	--use-compiler-family=gcc \
+	--enable-static \
+	;
+
 pushd build/lib
-export OPT="${RPM_OPT_FLAGS} -fPIC"
-make %{?_smp_mflags} -f gcc.mak all
+export OPT="${RPM_OPT_FLAGS}"
+make clean all %{?_smp_mflags}
 popd
 
-%install
-rm -rf %{buildroot}
-#cd src
-#make -f gcc.mak INSTALLDIR=$RPM_BUILD_ROOT%{_prefix} install
-#cd $RPM_BUILD_ROOT/usr/include/stlport
-#ln -s . ext
 
-pushd build/lib
-make -f gcc.mak install
-make -f gcc.mak \
-    install-release-static \
-    install-dbg-static     \
-    install-stldbg-static
-popd
+%check
+make check
 
-echo "Installing libs"
-install -d $RPM_BUILD_ROOT%{_libdir}
-#install -m0755 lib/* $RPM_BUILD_ROOT%{_libdir}
-cp -a lib/* $RPM_BUILD_ROOT%{_libdir}
 
-echo "Installing includes"
-install -d $RPM_BUILD_ROOT%{_includedir}/stlport
-cp -a stlport $RPM_BUILD_ROOT%{_includedir}/stlport
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 
+# fix library path
+mv $RPM_BUILD_ROOT$RPM_BUILD_ROOT%{_prefix}/lib/* $RPM_BUILD_ROOT%{_libdir}/
+rm -rf $RPM_BUILD_ROOT/home
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-
+%post devel -p /sbin/ldconfig
+%postun devel -p /sbin/ldconfig
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
-%doc INSTALL README
-%defattr(0644,root,root,0755)
-%{_libdir}/*.so.*
+%doc INSTALL INSTALL.unixes README doc etc
+%{_libdir}/libstlport.so.*
+%{_libdir}/libstlportg.so.*
+%{_libdir}/libstlportstlg.so.*
 
 %files devel
-%defattr(0644,root,root,0755)
-%doc doc/*
+%defattr(-,root,root)
 %{_includedir}/stlport
-%{_libdir}/*.a
-%{_libdir}/*.so
+%{_libdir}/libstlport*.a
+%{_libdir}/libstlport*.so
 
 
 %changelog
+* Tue Dec 14 2010 Shu KONNO <owa@bg.wakwak.com> 5.2.1-1
+- updated STLport to 5.2.1
+
 * Sun Oct 12 2008 Shu KONNO <owa@bg.wakwak.com> 5.1.5-2vl5
 - fixed copy option for symlink at %%install
 

+ 7 - 4
l/lm-sensors/lm-sensors-vl.spec

@@ -1,18 +1,17 @@
 Summary: Linux hardware monitoring
 Summary(ja): Linux ハードウェア監視ソフト
 Name: lm-sensors
-Version: 3.1.2
+Version: 3.2.0
 Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/System
 URL: http://www.lm-sensors.org/
 Source0: http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-%{version}.tar.bz2
-
-Requires: perl
 BuildRequires: sysfsutils-devel
 BuildRequires: bison, flex
+Requires: perl
+Requires: initscripts
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: shaolin, owa
@@ -98,6 +97,10 @@ fi
 %{_includedir}/sensors
 
 %changelog
+* Tue Dec 14 2010 Shu KONNO <owa@bg.wakwak.com> 3.2.0-1
+- updated lm-sensors to 3.2.0
+- added RQ: initscripts
+
 * Tue Mar 16 2010 Shu KONNO <owa@bg.wakwak.com> 3.1.2-1
 - updated lm-sensors to 3.1.2