From 37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Fri, 19 Oct 2012 16:40:52 +0200 Subject: Fix version stuff for rpm packaging. --- libuca.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libuca.spec.in') diff --git a/libuca.spec.in b/libuca.spec.in index 9e21bb2..4ffc671 100644 --- a/libuca.spec.in +++ b/libuca.spec.in @@ -62,8 +62,8 @@ mv "@UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot" $RPM_BUILD_ROOT %defattr(-,root,root,-) @CMAKE_INSTALL_PREFIX@/include/uca/*.h @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MINOR@ -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_ABI_VERSION@ +@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MAJOR@ +@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MAJOR@.@UCA_VERSION_MINOR@ @CMAKE_INSTALL_PREFIX@/lib/pkgconfig/uca.pc -- cgit v1.2.3 From 4245ad0b8d12574a3c2c15bd057246065e5026ca Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 30 Oct 2012 18:07:36 +0100 Subject: Fix rpm version substitution. --- libuca.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libuca.spec.in') diff --git a/libuca.spec.in b/libuca.spec.in index 4ffc671..3835d89 100644 --- a/libuca.spec.in +++ b/libuca.spec.in @@ -2,7 +2,7 @@ Buildroot: @UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/@CPACK_PACKAGE_FILE_NAME@ Summary: Abstract interface for different camera classes and frame grabber devices Name: libuca -Version: @VERSION@ +Version: @PACKAGE_VERSION@ Release: @CPACK_PACKAGE_RELEASE@ License: unknown Group: unknown -- cgit v1.2.3 From 7bd33f1eb88ce537e21693a805390d6385e43b80 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 30 Oct 2012 18:21:05 +0100 Subject: Include CPack in the build process and set the package file name correctly. --- libuca.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libuca.spec.in') diff --git a/libuca.spec.in b/libuca.spec.in index 3835d89..0f77f95 100644 --- a/libuca.spec.in +++ b/libuca.spec.in @@ -60,11 +60,10 @@ mv "@UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot" $RPM_BUILD_ROOT %files %defattr(-,root,root,-) +@CMAKE_INSTALL_PREFIX@/bin/control @CMAKE_INSTALL_PREFIX@/include/uca/*.h -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MAJOR@ -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MAJOR@.@UCA_VERSION_MINOR@ -@CMAKE_INSTALL_PREFIX@/lib/pkgconfig/uca.pc +@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/* +@CMAKE_INSTALL_PREFIX@/share/* %changelog -- cgit v1.2.3