[packages/libcue] - updated to 2.1.0 (note: new soname, -static is gone) - build system switched to cmake; removed obs

qboosh qboosh at pld-linux.org
Sat Jan 28 21:53:36 CET 2017


commit 0b722b286620e9888154d9bcc8e49d768861e32b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 28 21:55:08 2017 +0100

    - updated to 2.1.0 (note: new soname, -static is gone)
    - build system switched to cmake; removed obsolete am patch, added cmake patch with cmake related fixes

 libcue-am.patch    | 11 -----------
 libcue-cmake.patch | 31 ++++++++++++++++++++++++++++++
 libcue.spec        | 56 +++++++++++++++++++-----------------------------------
 3 files changed, 51 insertions(+), 47 deletions(-)
---
diff --git a/libcue.spec b/libcue.spec
index b039540..d3f0a39 100644
--- a/libcue.spec
+++ b/libcue.spec
@@ -1,17 +1,18 @@
 Summary:	CUE Sheet Parser Library
 Summary(pl.UTF-8):	Biblioteka analizująca Cue Sheet
 Name:		libcue
-Version:	1.4.0
-Release:	2
+Version:	2.1.0
+Release:	1
 License:	GPL v2, parts BSD-like
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/libcue/%{name}-%{version}.tar.bz2
-# Source0-md5:	5f5045f00e6ac92d9a057fe5b0982c69
-Patch0:		%{name}-am.patch
-URL:		http://libcue.sourceforge.net/
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	libtool
+#Source0Download: https://github.com/lipnitsk/libcue/releases
+Source0:	https://github.com/lipnitsk/libcue/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	0fff773e95175df349329ea34bc775cf
+Patch0:		%{name}-cmake.patch
+URL:		https://github.com/lipnitsk/libcue
+BuildRequires:	bison
+BuildRequires:	cmake >= 2.8
+BuildRequires:	flex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,6 +36,7 @@ Summary:	Header files for libcue library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libcue
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libcue-static
 
 %description devel
 Header files for libcue library.
@@ -42,35 +44,21 @@ Header files for libcue library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libcue.
 
-%package static
-Summary:	Static libcue library
-Summary(pl.UTF-8):	Statyczna biblioteka libcue
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static libcue library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libcue.
-
 %prep
 %setup -q
 %patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
+install -d build
+cd build
+%cmake ..
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -81,17 +69,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS
+%doc ChangeLog LICENSE README.md
 %attr(755,root,root) %{_libdir}/libcue.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcue.so.1
+%attr(755,root,root) %ghost %{_libdir}/libcue.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcue.so
-%{_libdir}/libcue.la
-%{_includedir}/libcue-1.4
+%{_includedir}/libcue.h
+%{_includedir}/libcue
 %{_pkgconfigdir}/libcue.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libcue.a
diff --git a/libcue-am.patch b/libcue-am.patch
deleted file mode 100644
index c2f84d5..0000000
--- a/libcue-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcue-1.4.0/configure.ac.orig	2010-05-03 20:10:43.000000000 +0200
-+++ libcue-1.4.0/configure.ac	2013-02-22 21:57:31.395997182 +0100
-@@ -2,7 +2,7 @@
- AC_CONFIG_AUX_DIR([config])
- AC_CONFIG_MACRO_DIR([config])
- AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- m4_define([package_major_version], [1])
- m4_define([package_minor_version], [4])
diff --git a/libcue-cmake.patch b/libcue-cmake.patch
new file mode 100644
index 0000000..d074756
--- /dev/null
+++ b/libcue-cmake.patch
@@ -0,0 +1,31 @@
+--- libcue-2.1.0/CMakeLists.txt.orig	2016-04-15 07:31:27.000000000 +0200
++++ libcue-2.1.0/CMakeLists.txt	2017-01-28 21:28:49.721352954 +0100
+@@ -5,7 +5,7 @@
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
+ 
+-PROJECT(libcue)
++PROJECT(libcue C)
+ 
+ SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+ ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}")
+@@ -19,7 +19,7 @@
+ 
+ CONFIGURE_FILE(libcue.pc.in libcue.pc @ONLY)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/libcue.pc
+-	DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++	DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ 
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # for generated files
+@@ -44,8 +44,8 @@
+ 	C_VISIBILITY_PRESET hidden)
+ 
+ INSTALL(TARGETS cue
+-	LIBRARY DESTINATION lib
+-	ARCHIVE DESTINATION lib)
++	LIBRARY DESTINATION lib${LIB_SUFFIX}
++	ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/libcue.h DESTINATION include)
+ if(CMAKE_HOST_UNIX)
+ 	INSTALL(DIRECTORY DESTINATION include/libcue)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcue.git/commitdiff/0b722b286620e9888154d9bcc8e49d768861e32b



More information about the pld-cvs-commit mailing list