diff options
| author | troyev <troyvelius@gmail.com> | 2019-05-23 12:26:59 +0000 |
|---|---|---|
| committer | XinfengZhang <carl.zhang@intel.com> | 2019-06-13 14:47:30 +0800 |
| commit | 1b309dd3270ab44abf4d59b8c45c374bfcb19f86 (patch) | |
| tree | 30336a8c89eefcfc076d838ee2c4dc6b8fb9c35b | |
| parent | ec9536c2b1c12e43ff047ecb2ec52dea6f5b90ba (diff) | |
| download | libva-1b309dd3270ab44abf4d59b8c45c374bfcb19f86.tar.gz | |
RPM build: removed git dependency and hard-coded paths
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | build/libva.spec | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index e90b931..9d347e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,15 +46,13 @@ rpm: build/$(PACKAGE).spec ./va/.rpmbuild/SRPMS \ ./va/.rpmbuild/RPMS/noarch \ ./va/.rpmbuild/tmp - git archive --format=tar.gz --prefix=$(PACKAGE)-$(VERSION)/ -o ./$(PACKAGE)-$(VERSION).tar.gz HEAD - cp -f $(PACKAGE)-$(VERSION).tar.gz ./va/.rpmbuild/SOURCES + make dist-gzip + mv $(PACKAGE)-$(VERSION).tar.gz ./va/.rpmbuild/SOURCES rpmbuild --define "_topdir $$PWD/va/.rpmbuild" \ --define "_tmppath $$PWD/va/.rpmbuild/tmp" \ --define "_sourcefile $(PACKAGE)-$(VERSION).tar.gz" \ --define "_version $(VERSION)" \ - --define "_sourcefile $(PACKAGE)-$(VERSION).tar.gz" \ -ba $(top_srcdir)/build/$(PACKAGE).spec @echo "============================================================" @echo "RPMs located in ./va/.rpmbuild/RPMS and ./va/.rpmbuild/SRPMS" endif - diff --git a/build/libva.spec b/build/libva.spec index 0a54b18..6a878d9 100644 --- a/build/libva.spec +++ b/build/libva.spec @@ -23,17 +23,15 @@ Intel libva %setup %build -./autogen.sh +./configure --prefix %{_prefix} --libdir %{_libdir} make -j12 %install make install DESTDIR=%{buildroot} -#mkdir -p %{buildroot}/usr/bin/ -#install -m 755 hello-world.sh %{buildroot}/usr/bin/hello-world.sh %files -/usr/local/lib/*.so* +%{_libdir}/*.so* %files devel -/usr/local/include/va/*.h -/usr/local/lib/pkgconfig/*.pc -/usr/local/lib/*.la +%{_includedir}/va/*.h +%{_libdir}/pkgconfig/*.pc +%{_libdir}/*.la |