- added lib64 patch (fixes build with non-empty LIB_SUFFIX)

diff --git a/vid.stab-lib64.patch b/vid.stab-lib64.patch
new file mode 100644 (file)
index 0000000..54879f7
--- /dev/null
+++ b/vid.stab-lib64.patch
@@ -0,0 +1,24 @@
+--- georgmartius-vid.stab-254ee37/src/CMakeLists.txt.orig      2013-07-17 20:19:09.407528014 +0200
++++ georgmartius-vid.stab-254ee37/src/CMakeLists.txt   2013-07-17 20:20:30.567769363 +0200
+@@ -64,8 +64,8 @@
+ 
+ INSTALL(TARGETS vidstab
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ )
+ 
+ include(create_pkgconfig_file)
+--- georgmartius-vid.stab-254ee37/CMakeModules/create_pkgconfig_file.cmake.orig        2013-07-17 20:21:13.279651489 +0200
++++ georgmartius-vid.stab-254ee37/CMakeModules/create_pkgconfig_file.cmake     2013-07-17 20:22:37.080004665 +0200
+@@ -21,5 +21,5 @@
+ 
+ ")
+ 
+-    install(FILES ${_pkgfname} DESTINATION lib/pkgconfig)
+-endmacro()
+\ No newline at end of file
++    install(FILES ${_pkgfname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
++endmacro()

diff --git a/vid.stab.spec b/vid.stab.spec
index 60d2a43acbfb4083b9e2bf3ec9ab9d3bd4b69cee..9791987b4f7183ee760375c4317ce615230d5dcb 100644 (file)
--- a/vid.stab.spec
+++ b/vid.stab.spec
@@ -16,8 +16,10 @@ Group:               Libraries
 Source0:       https://github.com/georgmartius/vid.stab/tarball/release-%{version}?/%{name}-%{version}.tar.gz
 # Source0-md5: 3dda75371b71e0e695cb1f679691c23c
 Patch0:                %{name}-git.patch
+Patch1:                %{name}-lib64.patch
 URL:           http://public.hronopik.de/vid.stab/
 BuildRequires: cmake >= 2.6
+BuildRequires: rpmbuild(macros) >= 1.605
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,6 +43,7 @@ Pliki nagłówkowe biblioteki vid.stab.
 %prep
 %setup -q -n georgmartius-%{name}-254ee37
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd src