diff --git a/.libkcddb.metadata b/.libkcddb.metadata new file mode 100644 index 0000000..da04e7e --- /dev/null +++ b/.libkcddb.metadata @@ -0,0 +1 @@ +125568df9a1f8e1f78f29d6e85ac7681100ed9ff SOURCES/libkcddb-4.10.5.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/libkcddb-4.9.98-libmusicbrainz5_cflags.patch b/SOURCES/libkcddb-4.9.98-libmusicbrainz5_cflags.patch new file mode 100644 index 0000000..cbdab55 --- /dev/null +++ b/SOURCES/libkcddb-4.9.98-libmusicbrainz5_cflags.patch @@ -0,0 +1,55 @@ +diff -up libkcddb-4.9.98/cmake/FindMusicBrainz5.cmake.cflags libkcddb-4.9.98/cmake/FindMusicBrainz5.cmake +--- libkcddb-4.9.98/cmake/FindMusicBrainz5.cmake.cflags 2012-12-18 02:40:19.000000000 -0600 ++++ libkcddb-4.9.98/cmake/FindMusicBrainz5.cmake 2013-01-20 00:14:44.860102865 -0600 +@@ -1,7 +1,7 @@ + # Module to find the musicbrainz-4 library + # + # It defines +-# MUSICBRAINZ5_INCLUDE_DIR - the include dir ++# MUSICBRAINZ5_INCLUDE_DIRS - the include dirs + # MUSICBRAINZ5_LIBRARIES - the required libraries + # MUSICBRAINZ5_FOUND - true if both of the above have been found + +@@ -10,17 +10,23 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-if(MUSICBRAINZ5_INCLUDE_DIR AND MUSICBRAINZ5_LIBRARIES) ++if(MUSICBRAINZ5_INCLUDE_DIRS AND MUSICBRAINZ5_LIBRARIES) + set(MUSICBRAINZ5_FIND_QUIETLY TRUE) +-endif(MUSICBRAINZ5_INCLUDE_DIR AND MUSICBRAINZ5_LIBRARIES) ++endif(MUSICBRAINZ5_INCLUDE_DIRS AND MUSICBRAINZ5_LIBRARIES) + +-FIND_PATH(MUSICBRAINZ5_INCLUDE_DIR musicbrainz5/Disc.h) +- +-FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5) ++IF (NOT WIN32) ++ # use pkg-config to get the directories and then use these values ++ # in the FIND_PATH() and FIND_LIBRARY() calls ++ find_package(PkgConfig) ++ PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5 ) ++ELSE (NOT WIN32) ++ FIND_PATH( MUSICBRAINZ5_INCLUDE_DIRS musicbrainz5/Disc.h ) ++ FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5 ) ++ENDIF (NOT WIN32) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args( MusicBrainz5 DEFAULT_MSG +- MUSICBRAINZ5_INCLUDE_DIR MUSICBRAINZ5_LIBRARIES) ++ MUSICBRAINZ5_INCLUDE_DIRS MUSICBRAINZ5_LIBRARIES) + +-MARK_AS_ADVANCED(MUSICBRAINZ5_INCLUDE_DIR MUSICBRAINZ5_LIBRARIES) ++MARK_AS_ADVANCED(MUSICBRAINZ5_INCLUDE_DIRS MUSICBRAINZ5_LIBRARIES) + +diff -up libkcddb-4.9.98/CMakeLists.txt.cflags libkcddb-4.9.98/CMakeLists.txt +--- libkcddb-4.9.98/CMakeLists.txt.cflags 2012-12-18 02:40:19.000000000 -0600 ++++ libkcddb-4.9.98/CMakeLists.txt 2013-01-20 00:15:42.811916101 -0600 +@@ -13,7 +13,7 @@ macro_log_feature(MUSICBRAINZ5_FOUND "Mu + + if(MUSICBRAINZ5_FOUND) + set(HAVE_MUSICBRAINZ5 1) +- include_directories(${MUSICBRAINZ5_INCLUDE_DIR}) ++ include_directories(${MUSICBRAINZ5_INCLUDE_DIRS}) + + set(libmusicbrainz_SRCS ${libmusicbrainz_SRCS} + musicbrainz/musicbrainzlookup.cpp diff --git a/SPECS/libkcddb.spec b/SPECS/libkcddb.spec new file mode 100644 index 0000000..e5b32e3 --- /dev/null +++ b/SPECS/libkcddb.spec @@ -0,0 +1,149 @@ +Name: libkcddb +Version: 4.10.5 +Release: 1%{?dist} +Summary: CDDB retrieval library + +License: LGPLv2+ and GPLv2+ +URL: http://www.kde.org/ +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz + +## upstreamable patches +# query/use pkg-config libmusicbrainz5 info +Patch50: libkcddb-4.9.98-libmusicbrainz5_cflags.patch + +BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: pkgconfig(libmusicbrainz5) + +Requires: kdelibs4%{?_isa} >= %{_kde4_version} +# kcmshell4 +Requires: kde-runtime%{?_isa} >= %{_kde4_version} + +# when split occured +Conflicts: kdemultimedia-libs < 6:4.8.80 + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: kdelibs4-devel +# when split occured +Conflicts: kdemultimedia-devel < 6:4.8.80 +%description devel +%{summary}. + + +%prep +%setup -q + +%patch50 -p1 -b .libmusicbrainz5_cflags + + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + + +%install +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +# fix documentation multilib conflict in index.cache +bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/cddbretrieval/index.cache.bz2 +sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/cddbretrieval/index.cache +sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/cddbretrieval/index.cache +bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/cddbretrieval/index.cache + +%find_lang %{name} --with-kde --all-name + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%doc TODO +%{_kde4_datadir}/config.kcfg/libkcddb.kcfg +%{_kde4_datadir}/kde4/services/libkcddb.desktop +%{_kde4_libdir}/libkcddb.so.4* +%{_kde4_libdir}/kde4/kcm_cddb.so + +%files devel +%{_kde4_includedir}/libkcddb/ +%{_kde4_libdir}/libkcddb.so +%{_kde4_libdir}/cmake/libkcddb/ + + +%changelog +* Sun Jun 30 2013 Than Ngo - 4.10.5-1 +- 4.10.5 + +* Sat Jun 01 2013 Rex Dieter - 4.10.4-1 +- 4.10.4 + +* Mon May 06 2013 Than Ngo - 4.10.3-1 +- 4.10.3 + +* Thu Apr 25 2013 Than Ngo - 4.10.2-2 +- fix multilib issue + +* Sun Mar 31 2013 Rex Dieter - 4.10.2-1 +- 4.10.2 + +* Sat Mar 02 2013 Rex Dieter 4.10.1-1 +- 4.10.1 + +* Thu Jan 31 2013 Rex Dieter - 4.10.0-1 +- 4.10.0 + +* Sat Jan 19 2013 Rex Dieter - 4.9.98-1 +- 4.9.98 + +* Fri Jan 04 2013 Rex Dieter - 4.9.97-1 +- 4.9.97 + +* Wed Dec 19 2012 Rex Dieter - 4.9.95-1 +- 4.9.95 +- BR: pkgconfig(libmusicbrainz5) + +* Mon Dec 03 2012 Rex Dieter 4.9.90-1 +- 4.9.90 (4.10 beta2) + +* Mon Dec 03 2012 Than Ngo - 4.9.4-1 +- 4.9.4 + +* Fri Nov 02 2012 Rex Dieter - 4.9.3-1 +- 4.9.3 + +* Fri Sep 28 2012 Rex Dieter - 4.9.2-1 +- 4.9.2 + +* Mon Sep 03 2012 Than Ngo - 4.9.1-1 +- 4.9.1 + +* Thu Jul 26 2012 Lukas Tinkl - 4.9.0-1 +- 4.9.0 + +* Thu Jul 19 2012 Fedora Release Engineering - 4.8.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Rex Dieter - 4.8.97-1 +- 4.8.97 + +* Wed Jun 27 2012 Jaroslav Reznik - 4.8.95-1 +- 4.8.95 + +* Fri Jun 08 2012 Rex Dieter 4.8.90-1 +- 4.8.90 + +* Thu May 31 2012 Jaroslav Reznik 4.8.80-1 +- initial try