diff --git a/.gitignore b/.gitignore index e574d31..99f5f53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libcacard-0.1.0.tar.bz2 /libcacard-0.1.2.tar.bz2 +/qemu-1.2.1.tar.bz2 diff --git a/0001-libcacard-build-vscclient-from-root-only.patch b/0001-libcacard-build-vscclient-from-root-only.patch new file mode 100644 index 0000000..55368c7 --- /dev/null +++ b/0001-libcacard-build-vscclient-from-root-only.patch @@ -0,0 +1,40 @@ +From d2d3d10a1422a99f55994dc6de3731b984241acb Mon Sep 17 00:00:00 2001 +From: Alon Levy +Date: Tue, 20 Nov 2012 18:04:32 +0200 +Subject: [PATCH] libcacard: build vscclient from root only + +Signed-off-by: Alon Levy +--- + libcacard/Makefile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libcacard/Makefile b/libcacard/Makefile +index 63990b7..faca3ca 100644 +--- a/libcacard/Makefile ++++ b/libcacard/Makefile +@@ -1,3 +1,7 @@ ++ifeq ($(BUILD_DIR),) ++ BUILD_DIR=$(CURDIR)/../ ++endif ++ + -include ../config-host.mak + -include $(SRC_PATH)/Makefile.objs + -include $(SRC_PATH)/rules.mak +@@ -46,12 +50,12 @@ libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in + + .PHONY: install-libcacard + +-install-libcacard: libcacard.pc libcacard.la vscclient ++install-libcacard: libcacard.pc libcacard.la ../vscclient + $(INSTALL_DIR) "$(DESTDIR)$(libdir)" + $(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" + $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" +- $(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" ++ $(LIBTOOL) --mode=install $(INSTALL_PROG) ../vscclient "$(DESTDIR)$(bindir)" + $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" + $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" + for inc in *.h; do \ +-- +1.8.0 + diff --git a/libcacard.spec b/libcacard.spec index 5055337..a580924 100644 --- a/libcacard.spec +++ b/libcacard.spec @@ -1,12 +1,13 @@ Name: libcacard -Version: 0.1.2 -Release: 3%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Common Access Card (CAC) Emulation Group: System Environment/Libraries License: LGPLv2+ -URL: http://www.spice-space.org/download -Source0: http://www.spice-space.org/download/libcacard/libcacard-%{version}.tar.bz2 -BuildRequires: nss-devel >= 3.12.8-2 +URL: http://www.qemu.org/ +Source0: http://wiki.qemu.org/download/qemu-%{version}.tar.bz2 +Patch00: 0001-libcacard-build-vscclient-from-root-only.patch +BuildRequires: nss-devel >= 3.12.8-2 libtool %description Common Access Card (CAC) emulation library. @@ -28,15 +29,17 @@ Requires: %{name} = %{version}-%{release} CAC emulation development files. %prep -%setup -q +%setup -n qemu-%{version} -q +%patch00 -p1 %build -%configure -make %{?_smp_mflags} +./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-guest-agent --target-list= +make libcacard.la %{?_smp_mflags} +make vscclient %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install-libcacard DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f %post -p /sbin/ldconfig @@ -59,6 +62,10 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f %{_bindir}/vscclient %changelog +* Tue Nov 20 2012 Alon Levy 1.2.0-1 +- libcacard independent repository is no longer used, qemu contains it as + a subdirectory. Switch and update version number to qemu's. + * Thu Jul 19 2012 Fedora Release Engineering - 0.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 70b5489..7524a7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca61fd1d7feaa09e37011daac95c0168 libcacard-0.1.2.tar.bz2 +189bc5b87281a72f8c72a0f7ebaa6d00 qemu-1.2.1.tar.bz2