From f07c4fbe635a0a33cc81cc595632c99279eb10ff Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 02 2017 22:30:47 +0000 Subject: import microdnf-2-2.el7.1.1 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f292d70 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/libpeas-1.20.0.tar.xz +SOURCES/microdnf-2.tar.gz diff --git a/.microdnf.metadata b/.microdnf.metadata new file mode 100644 index 0000000..4f610a9 --- /dev/null +++ b/.microdnf.metadata @@ -0,0 +1,2 @@ +3844f00f0ab3ded28c6a8c6c1c3186856bccdc30 SOURCES/libpeas-1.20.0.tar.xz +5491a82ed3ab1b3bc86a6da3b5417e0e45fb4eb0 SOURCES/microdnf-2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +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/0001-use-bundled-libpeas-in-case-proper-one-not-found.patch b/SOURCES/0001-use-bundled-libpeas-in-case-proper-one-not-found.patch new file mode 100644 index 0000000..869b0f6 --- /dev/null +++ b/SOURCES/0001-use-bundled-libpeas-in-case-proper-one-not-found.patch @@ -0,0 +1,53 @@ +From 06b6c44a0236bd499e71c2f56d0f5907e0a642c5 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Thu, 19 Jan 2017 16:44:53 +0100 +Subject: [PATCH] use bundled libpeas in case proper one not found + +Signed-off-by: Igor Gnatenko +--- + CMakeLists.txt | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04ca35a..e1ab4e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,9 +16,34 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=gnu11") + find_package (PkgConfig REQUIRED) + pkg_check_modules (GLIB REQUIRED glib-2.0>=2.44.0) + pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.44.0) +-pkg_check_modules (PEAS REQUIRED libpeas-1.0>=1.20.0) ++pkg_check_modules (PEAS QUIET libpeas-1.0>=1.20.0) + pkg_check_modules (LIBDNF REQUIRED libdnf>=0.7.0) + ++if (NOT PEAS_FOUND) ++ include (ExternalProject) ++ set (PEAS_ARCHIVE ${CMAKE_CURRENT_LIST_DIR}/libpeas-1.20.0.tar.xz) ++ set (PEAS_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/libpeas) ++ pkg_check_modules (PEAS_INTERNALS REQUIRED glib-2.0>=2.38.0 gobject-2.0>=2.38.0 gmodule-2.0>=2.38.0 gio-2.0>=2.32.0 gobject-introspection-1.0>=1.39.0) ++ ExternalProject_Add ( ++ libpeas_external ++ URL https://download.gnome.org/sources/libpeas/1.20/libpeas-1.20.0.tar.xz ++ URL_HASH SHA256=f392fffe2dc00072a51bb2a1b274224a06bdc5f9c3b3c0ac4816909e9933d354 ++ CONFIGURE_COMMAND ++ COMMAND ./configure --prefix=${PEAS_INSTALL_PREFIX} --enable-static --disable-shared --disable-lua5.1 --disable-luajit --disable-python2 --disable-python3 --disable-gtk --disable-glade-catalog ++ BUILD_COMMAND ++ COMMAND make ++ INSTALL_COMMAND ++ COMMAND make install ++ BUILD_IN_SOURCE 1 ++ ) ++ ++ add_library (libpeas STATIC IMPORTED) ++ add_dependencies (libpeas libpeas_external) ++ set_target_properties (libpeas PROPERTIES IMPORTED_LOCATION ${PEAS_INSTALL_PREFIX}/lib/libpeas-1.0.a) ++ set (PEAS_INCLUDE_DIRS ${PEAS_INSTALL_PREFIX}/include/libpeas-1.0;${PEAS_INTERNALS_STATIC_INCLUDE_DIRS}) ++ set (PEAS_LIBRARIES libpeas;${PEAS_INTERNALS_STATIC_LIBRARIES}) ++endif () ++ + set (PKG_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/dnf) + set (PKG_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/dnf) + add_definitions (-DPACKAGE_LIBDIR="${PKG_LIBDIR}") +-- +2.7.4 + diff --git a/SOURCES/0002-print-downloading-packages-only-once.patch b/SOURCES/0002-print-downloading-packages-only-once.patch new file mode 100644 index 0000000..7859e93 --- /dev/null +++ b/SOURCES/0002-print-downloading-packages-only-once.patch @@ -0,0 +1,47 @@ +From 15837579fef30f1e8fe1aa3017eb5441caf3f09c Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Fri, 17 Feb 2017 21:46:28 +0100 +Subject: [PATCH 2/2] print downloading packages only once + +Signed-off-by: Igor Gnatenko +--- + dnf/dnf-main.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/dnf/dnf-main.c b/dnf/dnf-main.c +index 610ad74..6473bb3 100644 +--- a/dnf/dnf-main.c ++++ b/dnf/dnf-main.c +@@ -29,6 +29,7 @@ + static gboolean opt_yes = TRUE; + static gboolean opt_nodocs = FALSE; + static gboolean show_help = FALSE; ++static gboolean dl_pkgs_printed = FALSE; + + static gboolean + process_global_option (const gchar *option_name, +@@ -115,8 +116,11 @@ state_action_changed_cb (DnfState *state, + g_print("Downloading metadata...\n"); + break; + case DNF_STATE_ACTION_DOWNLOAD_PACKAGES: +- g_print("Downloading: %s (%u%%)\n", action_hint, +- dnf_state_get_percentage (state)); ++ if (!dl_pkgs_printed) ++ { ++ g_print("Downloading packages...\n"); ++ dl_pkgs_printed = TRUE; ++ } + break; + case DNF_STATE_ACTION_TEST_COMMIT: + g_print("Running transaction test...\n"); +@@ -141,6 +145,7 @@ state_action_changed_cb (DnfState *state, + break; + case DNF_STATE_ACTION_CLEANUP: + g_print("Cleanup: %s\n", action_hint); ++ break; + default: + break; + } +-- +2.7.4 + diff --git a/SPECS/microdnf.spec b/SPECS/microdnf.spec new file mode 100644 index 0000000..7937dd0 --- /dev/null +++ b/SPECS/microdnf.spec @@ -0,0 +1,73 @@ +%if 0%{?rhel} && 0%{?rhel} <= 7 +%global buildsys cmake +%global buildsys_req cmake >= 2.8.5 +%else +%global buildsys meson +%global buildsys_req meson >= 0.36.0 +%endif + +Name: microdnf +Version: 2 +Release: 2%{?dist}.1.1 +Summary: Micro DNF + +License: GPLv3+ and LGPLv2+ +URL: https://github.com/rpm-software-management/microdnf +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: https://download.gnome.org/sources/libpeas/1.20/libpeas-1.20.0.tar.xz +Patch0001: 0001-use-bundled-libpeas-in-case-proper-one-not-found.patch +Patch0002: 0002-print-downloading-packages-only-once.patch + +BuildRequires: gcc +BuildRequires: %{buildsys_req} +BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.44.0 +BuildRequires: pkgconfig(libdnf) >= 0.7.0 +BuildRequires: pkgconfig(gmodule-2.0) >= 2.38.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.32.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 +BuildRequires: intltool +Provides: bundled(libpeas) = 1.20.0 + +%description +%{summary}. + +%prep +%autosetup -p1 -a1 +sed -i -e "s|URL https://download.gnome.org/sources/libpeas/1.20/libpeas-1.20.0.tar.xz|SOURCE_DIR \${CMAKE_CURRENT_LIST_DIR}/libpeas-1.20.0|" CMakeLists.txt + +%if %{buildsys} == "cmake" +%build +mkdir %{_target_platform} +pushd %{_target_platform} + %cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo +popd +%make_build -C %{_target_platform} + +%install +%make_install -C %{_target_platform} +%endif + +%if %{buildsys} == "meson" +%build +%meson +%meson_build + +%install +%meson_install +%endif + +%files +%license COPYING libpeas-1.20.0/COPYING +%doc README.md +%{_bindir}/%{name} + +%changelog +* Mon Feb 20 2017 Jan Silhan - 2-2 +- print downloading packages only once + +* Mon Dec 12 2016 Jan Silhan - 2-1 +- Update to 2 + +* Mon Dec 12 2016 Igor Gnatenko - 1-1 +- Initial package