summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihael Koep <koep@schneide.com>2012-10-19 16:40:52 +0200
committerMihael Koep <koep@schneide.com>2012-10-19 16:40:52 +0200
commit37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3 (patch)
treee7a52315d940f77682cf3700edf244677e2343a5
parent420839db21e0bb60f6be72f1924af74b0ffe8224 (diff)
downloaduca-37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3.tar.gz
uca-37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3.tar.bz2
uca-37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3.tar.xz
uca-37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3.zip
Fix version stuff for rpm packaging.
-rw-r--r--CMakeLists.txt2
-rw-r--r--libuca.spec.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf0386..dffd35d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(uca C)
set(TARNAME "libuca")
set(UCA_VERSION_MAJOR "1")
set(UCA_VERSION_MINOR "0")
-set(UCA_VERSION_PATCH "2-dev")
+set(UCA_VERSION_PATCH "2dev")
set(UCA_DESCRIPTION "Unified Camera Access")
set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}")
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