summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Zhang <carl.zhang@intel.com>2019-06-14 09:32:11 -0400
committerCarl Zhang <carl.zhang@intel.com>2019-06-14 09:37:19 -0400
commit4edf752e23aa1ce7367b17d80f9ba3b7b58ce5ed (patch)
tree38e4f664d27450d47afda6d669d6038445621126
parent8c80b758b133a4d88fb5d6859841bcd316a016bc (diff)
downloadlibva-4edf752e23aa1ce7367b17d80f9ba3b7b58ce5ed.tar.gz
Revert "Added 'make rpm' target"
This reverts commit ec9536c2b1c12e43ff047ecb2ec52dea6f5b90ba to 8c80b758b133a4d88fb5d6859841bcd316a016bc Signed-off-by: Carl Zhang <carl.zhang@intel.com>
-rw-r--r--Makefile.am20
-rw-r--r--build/libva.spec37
-rw-r--r--configure.ac3
3 files changed, 0 insertions, 60 deletions
diff --git a/Makefile.am b/Makefile.am
index 07d5b22..5d0de2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,23 +36,3 @@ MAINTAINERCLEANFILES = \
aclocal.m4 compile config.guess config.sub \
configure depcomp install-sh ltmain.sh \
Makefile.in missing
-
-if HAVE_RPMBUILD
-rpm: build/$(PACKAGE).spec
- rm -rf ./va/.rpmbuild
- mkdir -p ./va/.rpmbuild/BUILD \
- ./va/.rpmbuild/SPECS \
- ./va/.rpmbuild/SOURCES \
- ./va/.rpmbuild/SRPMS \
- ./va/.rpmbuild/RPMS/noarch \
- ./va/.rpmbuild/tmp
- tar cf $(PACKAGE)-$(VERSION).tar.gz . --transform 's,^,$(PACKAGE)-$(VERSION)/,'
- 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)" \
- -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
deleted file mode 100644
index 8470e35..0000000
--- a/build/libva.spec
+++ /dev/null
@@ -1,37 +0,0 @@
-Name: libva
-Version: %{_version}
-Release: el7
-Summary: Intel libva
-License: MIT
-Source0: %{_sourcefile}
-
-%package devel
-Group: Development/Libraries
-Summary: Development files for libva
-
-%description devel
-Development files for libva
-
-BuildRequires: automake
-BuildRequires: autoconf
-
-%description
-Intel libva
-
-%prep
-
-%setup
-
-%build
-./configure --prefix %{_prefix} --libdir %{_libdir}
-make -j$(nproc)
-
-%install
-make install DESTDIR=%{buildroot}
-
-%files
-%{_libdir}/*.so*
-%files devel
-%{_includedir}/va/*.h
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.la
diff --git a/configure.ac b/configure.ac
index b8702af..7942f57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,9 +309,6 @@ fi
AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
-AC_CHECK_PROG(HAVE_RPMBUILD, rpmbuild, true, false)
-AM_CONDITIONAL(HAVE_RPMBUILD,$HAVE_RPMBUILD)
-
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)