This commit is contained in:
Rex Dieter 2013-11-08 08:02:21 -06:00
parent 7f7028fa40
commit d21980d2f7
5 changed files with 166 additions and 0 deletions

1
.gitignore vendored
View File

@ -0,0 +1 @@
/AppStream-0.4.0.tar.gz

View File

@ -0,0 +1,25 @@
From 77f3365eca21e4cf34446c525fa9499b5a7cae9f Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 20 Oct 2013 19:06:36 +0200
Subject: [PATCH 3/3] Always install appstream.pc in correct libdir
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 503df05..29803a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,7 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/appstream.pc.in ${CMAKE_CURRENT_BINA
install(TARGETS appstream DESTINATION ${INSTALL_DIR_LIB})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.vapi DESTINATION share/vala/vapi)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.h DESTINATION include)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.pc DESTINATION lib/pkgconfig/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.pc DESTINATION ${INSTALL_DIR_LIB}/pkgconfig/)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.gir DESTINATION share/gir-1.0/)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.typelib DESTINATION lib/girepository-1.0/)
--
1.8.4.2

View File

@ -0,0 +1,25 @@
diff -up AppStream-0.4.0/CMakeLists.txt.LIB_SUFFIX AppStream-0.4.0/CMakeLists.txt
--- AppStream-0.4.0/CMakeLists.txt.LIB_SUFFIX 2013-10-20 09:20:39.000000000 -0500
+++ AppStream-0.4.0/CMakeLists.txt 2013-11-03 19:40:48.730834229 -0600
@@ -65,7 +65,7 @@ find_package (Gettext REQUIRED)
# Default paths
#
set(INSTALL_DIR_BIN bin CACHE PATH "Installation directory for executables")
-set(INSTALL_DIR_LIB lib/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
+set(INSTALL_DIR_LIB lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
set(INSTALL_DIR_LIBEXEC "${INSTALL_DIR_LIB}/appstream" CACHE PATH "Installation directory for executables use by a library")
set(INSTALL_DIR_INC include CACHE PATH "Installation directory for headers")
set(INSTALL_DIR_SYSCONF /etc CACHE PATH "Installation directory for system configuration files")
diff -up AppStream-0.4.0/src/CMakeLists.txt.LIB_SUFFIX AppStream-0.4.0/src/CMakeLists.txt
--- AppStream-0.4.0/src/CMakeLists.txt.LIB_SUFFIX 2013-11-03 19:40:48.731834211 -0600
+++ AppStream-0.4.0/src/CMakeLists.txt 2013-11-03 19:41:52.387697221 -0600
@@ -111,7 +111,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.h DESTINATION include)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.pc DESTINATION ${INSTALL_DIR_LIB}/pkgconfig/)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.gir DESTINATION share/gir-1.0/)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.typelib DESTINATION lib/girepository-1.0/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.typelib DESTINATION lib${LIB_SUFFIX}/girepository-1.0/)
+
# include the PackageKit plugin
add_subdirectory(pk-plugin)

114
appstream.spec Normal file
View File

@ -0,0 +1,114 @@
Summary: Utilities to generate, maintain and access the AppStream Xapian database
Name: appstream
Version: 0.4.0
Release: 2%{?dist}
# lib LGPLv3+, tools GPLv3+
License: GPLv3+ and LGPLv3+
URL: http://www.freedesktop.org/wiki/Distributions/Distributions/AppStream/Software/
Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.gz
## upstream patches
# fix pkgconfig install
Patch0003: 0003-Always-install-appstream.pc-in-correct-libdir.patch
## upstreamable patches
# support LIB_SUFFIX
Patch1: AppStream-0.4.0-LIB_SUFFIX.patch
BuildRequires: cmake
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: pkgconfig(gio-2.0) pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(packagekit-plugin)
BuildRequires: vala
BuildRequires: xapian-core-devel
BuildRequires: xmlto
%description
AppStream-Core makes it easy to access application information from the
AppStream database over a nice GObject-based interface. It uses a
PackageKit plugin to automatically (re)generate the AppStream Xapian
database of applications.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
%{summary}.
%package vala
Summary: Vala bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: vala
%description vala
%{summary}.
%prep
%setup -q -n AppStream-%{version}
%patch0003 -p1 -b .0003
%patch1 -p1 -b .LIB_SUFFIX
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mkdir -p %{buildroot}{%{_datadir},/var/cache}/app-info/{icons,xmls}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc AUTHORS
%doc LICENSE.GPLv3 LICENSE.LGPLv3
%config(noreplace) %{_sysconfdir}/appstream.conf
%{_bindir}/appstream-index
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/AppStream-0.4.typelib
%{_libdir}/libappstream.so.0*
%dir %{_libdir}/packagekit-plugins
%{_libdir}/packagekit-plugins/libpk_plugin_appstream.so
%dir %{_datadir}/app-info/
%dir %{_datadir}/app-info/icons
%dir %{_datadir}/app-info/xmls
%{_datadir}/app-info/categories.xml
%dir /var/cache/app-info
%dir /var/cache/app-info/icons
%dir /var/cache/app-info/xmls
%{_mandir}/man1/appstream-index.1*
%files devel
%{_includedir}/appstream.h
%{_libdir}/libappstream.so
%{_libdir}/pkgconfig/appstream.pc
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/AppStream-0.4.gir
%files vala
%{_datadir}/vala/vapi/appstream.vapi
%changelog
* Mon Nov 04 2013 Rex Dieter <rdieter@fedoraproject.org> 0.4.0-2
- -vala subpkg
- own %%{_libdir}/girepository-1.0, %%{_libdir}/packagekit-plugins (until someone better comes along)
* Sun Nov 03 2013 Rex Dieter <rdieter@fedoraproject.org> 0.4.0-1
- AppStream-0.4.0

View File

@ -0,0 +1 @@
60b87feb617c8e9b494ef8ef48353d68 AppStream-0.4.0.tar.gz