Browse Source

updated 2 packages

ftdumps-0.1.1-4

libatasmart-0.19-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12359 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
465cce9f59
2 changed files with 26 additions and 11 deletions
  1. 12 7
      f/ftdumps/ftdumps-vl.spec
  2. 14 4
      lib/liba/libatasmart/libatasmart-vl.spec

+ 12 - 7
f/ftdumps/ftdumps-vl.spec

@@ -1,20 +1,20 @@
 Summary: TrueType infomation dump util
 Name: ftdumps
 Version: 0.1.1
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
+Group: User Interface/X
+Distribution: Vine Linux
+Vendor: Project Vine
+
+License: GPL
 Source: ftdumps-%{version}.tgz
 Patch0: ftdumps-0.1.1-remove-extra-token.patch
 Patch1: ftdumps-0.1.1-iconv-arg-type.patch
 Patch2: ftdumps-0.1.1-sfnt.patch
 Patch3: ftdumps-0.1.1-freetype-2.5.x.patch
-License: GPL
-Group: User Interface/X
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Requires: freetype2 >= 2.0.6
 BuildRequires: freetype2-devel
 
-Distribution: Vine Linux
-Vendor: Project Vine
 
 %description
 TrueType infomation dump util
@@ -29,7 +29,9 @@ TrueType infomation dump util
 %patch3 -p1 -b .ft2
 
 %build
-make
+FREETYPE_CFLAGS=$(pkg-config --cflags freetype2)
+
+make CFLAGS="%{optflags} $FREETYPE_CFLAGS -I%{_includedir}/freetype2/freetype"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.1.1-4
+- rebuilt with current environment.
+
 * Mon Jan 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.1-3
 - rebuild with VineSeed environment
 - add Patch3 (ftdumps-0.1.1-freetype-2.5.x.patch)

+ 14 - 4
lib/liba/libatasmart/libatasmart-vl.spec

@@ -2,13 +2,18 @@ Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Summary(ja): ATA S.M.A.R.T. ディスクモニタリングライブラリ
 Name: libatasmart
 Version: 0.19
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
-Source0: http://0pointer.de/public/libatasmart-%{version}.tar.xz
+Distribution: Vine Linux
+Vendor: Project Vine
+
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libatasmart.git;a=summary
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: eudev-libudev-devel
+Source0: http://0pointer.de/public/libatasmart-%{version}.tar.xz
+Patch0: libatasmart-0.19-wd-fix.patch
+
+BuildRequires: libudev-devel
 
 %description
 A small and lightweight parser library for ATA S.M.A.R.T. hard disk
@@ -30,6 +35,7 @@ Development Files for libatasmart Client Development
 
 %prep
 %setup -q
+%autopatch -p1
 
 %build
 %configure --disable-static
@@ -46,7 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README LGPL
+%license LGPL
+%doc README
 %{_libdir}/libatasmart.so.*
 %{_sbindir}/skdump
 %{_sbindir}/sktest
@@ -60,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA*
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.19-2
+- import Patch0 from rawhide.
+
 * Sun May 17 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.19-1
 - update to 0.19