Page MenuHomeSolus
Files F11012160

D1764.diff
No OneTemporary
Actions

D1764.diff
View Options

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1,132 +1,201 @@
-libcreaterepo_c.so.0:cmp_old_repodata_files
-libcreaterepo_c.so.0:cr_add_filelists_pkg_db
-libcreaterepo_c.so.0:cr_add_other_pkg_db
-libcreaterepo_c.so.0:cr_add_primary_pkg_db
+libcreaterepo_c.so.0:cr_append_pid_and_datetime
libcreaterepo_c.so.0:cr_better_copy_file
+libcreaterepo_c.so.0:cr_binary_data_new
+libcreaterepo_c.so.0:cr_block_terminating_signals
libcreaterepo_c.so.0:cr_changelog_entry_new
+libcreaterepo_c.so.0:cr_char_handler
+libcreaterepo_c.so.0:cr_checksum_file
+libcreaterepo_c.so.0:cr_checksum_final
libcreaterepo_c.so.0:cr_checksum_name_str
+libcreaterepo_c.so.0:cr_checksum_new
+libcreaterepo_c.so.0:cr_checksum_type
+libcreaterepo_c.so.0:cr_checksum_update
libcreaterepo_c.so.0:cr_close
-libcreaterepo_c.so.0:cr_close_db
libcreaterepo_c.so.0:cr_cmp_evr
libcreaterepo_c.so.0:cr_cmp_version_str
-libcreaterepo_c.so.0:cr_compare_values
-libcreaterepo_c.so.0:cr_compress_file
+libcreaterepo_c.so.0:cr_compress_file_with_stat
+libcreaterepo_c.so.0:cr_compressing_thread
libcreaterepo_c.so.0:cr_compression_suffix
-libcreaterepo_c.so.0:cr_compute_file_checksum
+libcreaterepo_c.so.0:cr_compression_type
+libcreaterepo_c.so.0:cr_compressiontask_free
+libcreaterepo_c.so.0:cr_compressiontask_new
+libcreaterepo_c.so.0:cr_contentstat_free
+libcreaterepo_c.so.0:cr_contentstat_new
libcreaterepo_c.so.0:cr_copy_file
-libcreaterepo_c.so.0:cr_db_error_quark
-libcreaterepo_c.so.0:cr_dbinfo_update
+libcreaterepo_c.so.0:cr_cp
+libcreaterepo_c.so.0:cr_cut_dirs
+libcreaterepo_c.so.0:cr_db_add_filelists_pkg
+libcreaterepo_c.so.0:cr_db_add_other_pkg
+libcreaterepo_c.so.0:cr_db_add_pkg
+libcreaterepo_c.so.0:cr_db_add_primary_pkg
+libcreaterepo_c.so.0:cr_db_close
+libcreaterepo_c.so.0:cr_db_dbinfo_update
+libcreaterepo_c.so.0:cr_db_destroy_filelists_statements
+libcreaterepo_c.so.0:cr_db_destroy_other_statements
+libcreaterepo_c.so.0:cr_db_destroy_primary_statements
+libcreaterepo_c.so.0:cr_db_open
+libcreaterepo_c.so.0:cr_db_prepare_filelists_statements
+libcreaterepo_c.so.0:cr_db_prepare_other_statements
+libcreaterepo_c.so.0:cr_db_prepare_primary_statements
+libcreaterepo_c.so.0:cr_decompress_file_with_stat
libcreaterepo_c.so.0:cr_dependency_new
-libcreaterepo_c.so.0:cr_destroy_filelists_db_statements
-libcreaterepo_c.so.0:cr_destroy_metadata
libcreaterepo_c.so.0:cr_destroy_metadata_hashtable
-libcreaterepo_c.so.0:cr_destroy_other_db_statements
-libcreaterepo_c.so.0:cr_destroy_primary_db_statements
libcreaterepo_c.so.0:cr_detect_compression
+libcreaterepo_c.so.0:cr_distrotag_new
libcreaterepo_c.so.0:cr_download
-libcreaterepo_c.so.0:cr_dump_files
-libcreaterepo_c.so.0:cr_dumper_cleanup
-libcreaterepo_c.so.0:cr_dumper_init
-libcreaterepo_c.so.0:cr_fill_repomdrecord
+libcreaterepo_c.so.0:cr_drpm_support
+libcreaterepo_c.so.0:cr_dumper_thread
+libcreaterepo_c.so.0:cr_evr_free
libcreaterepo_c.so.0:cr_flag_to_str
-libcreaterepo_c.so.0:cr_free_distro
-libcreaterepo_c.so.0:cr_free_metadata_location
-libcreaterepo_c.so.0:cr_free_repomd
-libcreaterepo_c.so.0:cr_free_repomdrecord
-libcreaterepo_c.so.0:cr_generate_repomd_xml
+libcreaterepo_c.so.0:cr_free_values
+libcreaterepo_c.so.0:cr_get_compressed_content_stat
libcreaterepo_c.so.0:cr_get_filename
libcreaterepo_c.so.0:cr_get_header_byte_range
-libcreaterepo_c.so.0:cr_get_metadata_location
-libcreaterepo_c.so.0:cr_load_xml_metadata
-libcreaterepo_c.so.0:cr_locate_and_load_xml_metadata
+libcreaterepo_c.so.0:cr_hascontrollchars
+libcreaterepo_c.so.0:cr_identical_files
+libcreaterepo_c.so.0:cr_latin1_to_utf8
+libcreaterepo_c.so.0:cr_locate_metadata
+libcreaterepo_c.so.0:cr_lock_repo
libcreaterepo_c.so.0:cr_log_fn
-libcreaterepo_c.so.0:cr_new_distro
-libcreaterepo_c.so.0:cr_new_metadata
+libcreaterepo_c.so.0:cr_metadata_free
+libcreaterepo_c.so.0:cr_metadata_hashtable
+libcreaterepo_c.so.0:cr_metadata_key
+libcreaterepo_c.so.0:cr_metadata_load_xml
+libcreaterepo_c.so.0:cr_metadata_locate_and_load_xml
+libcreaterepo_c.so.0:cr_metadata_new
+libcreaterepo_c.so.0:cr_metadata_set_dupaction
+libcreaterepo_c.so.0:cr_metadatalocation_free
+libcreaterepo_c.so.0:cr_modifyrepo
+libcreaterepo_c.so.0:cr_modifyrepo_parse_batchfile
+libcreaterepo_c.so.0:cr_modifyrepotask_free
+libcreaterepo_c.so.0:cr_modifyrepotask_new
+libcreaterepo_c.so.0:cr_nevr_free
+libcreaterepo_c.so.0:cr_nevra_free
libcreaterepo_c.so.0:cr_new_metadata_hashtable
-libcreaterepo_c.so.0:cr_new_repomd
-libcreaterepo_c.so.0:cr_new_repomdrecord
+libcreaterepo_c.so.0:cr_newpkgcb
libcreaterepo_c.so.0:cr_normalize_dir_path
libcreaterepo_c.so.0:cr_null_log_fn
-libcreaterepo_c.so.0:cr_nvrea_free
-libcreaterepo_c.so.0:cr_open
-libcreaterepo_c.so.0:cr_open_db
+libcreaterepo_c.so.0:cr_old_metadata_retention
+libcreaterepo_c.so.0:cr_package_copy
libcreaterepo_c.so.0:cr_package_file_new
libcreaterepo_c.so.0:cr_package_free
-libcreaterepo_c.so.0:cr_package_from_file
+libcreaterepo_c.so.0:cr_package_from_header
+libcreaterepo_c.so.0:cr_package_from_rpm
+libcreaterepo_c.so.0:cr_package_from_rpm_base
+libcreaterepo_c.so.0:cr_package_nevra
libcreaterepo_c.so.0:cr_package_new
libcreaterepo_c.so.0:cr_package_new_without_chunk
libcreaterepo_c.so.0:cr_package_nvra
+libcreaterepo_c.so.0:cr_package_parser_cleanup
libcreaterepo_c.so.0:cr_package_parser_init
-libcreaterepo_c.so.0:cr_package_parser_shutdown
-libcreaterepo_c.so.0:cr_parse_header
-libcreaterepo_c.so.0:cr_prepare_filelists_db_statements
-libcreaterepo_c.so.0:cr_prepare_other_db_statements
-libcreaterepo_c.so.0:cr_prepare_primary_db_statements
libcreaterepo_c.so.0:cr_printf
-libcreaterepo_c.so.0:cr_process_groupfile_repomdrecord
libcreaterepo_c.so.0:cr_puts
+libcreaterepo_c.so.0:cr_queue_free_full
libcreaterepo_c.so.0:cr_read
libcreaterepo_c.so.0:cr_remove_dir
libcreaterepo_c.so.0:cr_remove_dir_cb
-libcreaterepo_c.so.0:cr_remove_metadata
libcreaterepo_c.so.0:cr_remove_metadata_classic
-libcreaterepo_c.so.0:cr_rename_repomdrecord_file
libcreaterepo_c.so.0:cr_repomd_add_content_tag
libcreaterepo_c.so.0:cr_repomd_add_distro_tag
libcreaterepo_c.so.0:cr_repomd_add_repo_tag
+libcreaterepo_c.so.0:cr_repomd_copy
+libcreaterepo_c.so.0:cr_repomd_detach_record
+libcreaterepo_c.so.0:cr_repomd_free
+libcreaterepo_c.so.0:cr_repomd_get_record
+libcreaterepo_c.so.0:cr_repomd_new
+libcreaterepo_c.so.0:cr_repomd_record_compress_and_fill
+libcreaterepo_c.so.0:cr_repomd_record_copy
+libcreaterepo_c.so.0:cr_repomd_record_fill
+libcreaterepo_c.so.0:cr_repomd_record_fill_thread
+libcreaterepo_c.so.0:cr_repomd_record_free
+libcreaterepo_c.so.0:cr_repomd_record_load_contentstat
+libcreaterepo_c.so.0:cr_repomd_record_new
+libcreaterepo_c.so.0:cr_repomd_record_rename_file
+libcreaterepo_c.so.0:cr_repomd_remove_record
+libcreaterepo_c.so.0:cr_repomd_set_contenthash
libcreaterepo_c.so.0:cr_repomd_set_record
+libcreaterepo_c.so.0:cr_repomd_set_repoid
libcreaterepo_c.so.0:cr_repomd_set_revision
+libcreaterepo_c.so.0:cr_repomd_sort_records
+libcreaterepo_c.so.0:cr_repomdrecordfilltask_free
+libcreaterepo_c.so.0:cr_repomdrecordfilltask_new
+libcreaterepo_c.so.0:cr_rm
+libcreaterepo_c.so.0:cr_set_cleanup_handler
+libcreaterepo_c.so.0:cr_setup_logging
libcreaterepo_c.so.0:cr_slist_free_full
+libcreaterepo_c.so.0:cr_sopen
+libcreaterepo_c.so.0:cr_spawn_check_exit_status
libcreaterepo_c.so.0:cr_split_rpm_filename
libcreaterepo_c.so.0:cr_str_to_evr
+libcreaterepo_c.so.0:cr_str_to_nevr
+libcreaterepo_c.so.0:cr_str_to_nevra
libcreaterepo_c.so.0:cr_str_to_version
+libcreaterepo_c.so.0:cr_strerror
+libcreaterepo_c.so.0:cr_unblock_terminating_signals
+libcreaterepo_c.so.0:cr_unset_cleanup_handler
+libcreaterepo_c.so.0:cr_updatecollection_append_package
+libcreaterepo_c.so.0:cr_updatecollection_copy
+libcreaterepo_c.so.0:cr_updatecollection_free
+libcreaterepo_c.so.0:cr_updatecollection_new
+libcreaterepo_c.so.0:cr_updatecollectionpackage_copy
+libcreaterepo_c.so.0:cr_updatecollectionpackage_free
+libcreaterepo_c.so.0:cr_updatecollectionpackage_new
+libcreaterepo_c.so.0:cr_updateinfo_apped_record
+libcreaterepo_c.so.0:cr_updateinfo_free
+libcreaterepo_c.so.0:cr_updateinfo_new
+libcreaterepo_c.so.0:cr_updaterecord_append_collection
+libcreaterepo_c.so.0:cr_updaterecord_append_reference
+libcreaterepo_c.so.0:cr_updaterecord_copy
+libcreaterepo_c.so.0:cr_updaterecord_free
+libcreaterepo_c.so.0:cr_updaterecord_new
+libcreaterepo_c.so.0:cr_updatereference_copy
+libcreaterepo_c.so.0:cr_updatereference_free
+libcreaterepo_c.so.0:cr_updatereference_new
+libcreaterepo_c.so.0:cr_warning_cb
libcreaterepo_c.so.0:cr_write
+libcreaterepo_c.so.0:cr_write_to_file
+libcreaterepo_c.so.0:cr_xmlNewProp
+libcreaterepo_c.so.0:cr_xmlNewTextChild
libcreaterepo_c.so.0:cr_xml_dump
+libcreaterepo_c.so.0:cr_xml_dump_cleanup
+libcreaterepo_c.so.0:cr_xml_dump_delta
+libcreaterepo_c.so.0:cr_xml_dump_deltapackage
libcreaterepo_c.so.0:cr_xml_dump_filelists
+libcreaterepo_c.so.0:cr_xml_dump_filelists_items
+libcreaterepo_c.so.0:cr_xml_dump_files
+libcreaterepo_c.so.0:cr_xml_dump_init
libcreaterepo_c.so.0:cr_xml_dump_other
+libcreaterepo_c.so.0:cr_xml_dump_other_changelog
+libcreaterepo_c.so.0:cr_xml_dump_other_items
libcreaterepo_c.so.0:cr_xml_dump_primary
-libcreaterepo_c.so.0:cr_xml_from_header
-libcreaterepo_c.so.0:cr_xml_from_package_file
-libcreaterepo_c.so.0:db_changelog_prepare
-libcreaterepo_c.so.0:db_create_filelists_tables
-libcreaterepo_c.so.0:db_create_other_tables
-libcreaterepo_c.so.0:db_dependency_prepare
-libcreaterepo_c.so.0:db_dependency_write
-libcreaterepo_c.so.0:db_file_prepare
-libcreaterepo_c.so.0:db_file_write
-libcreaterepo_c.so.0:db_filelists_prepare
-libcreaterepo_c.so.0:db_filelists_write
-libcreaterepo_c.so.0:db_index_filelists_tables
-libcreaterepo_c.so.0:db_index_other_tables
-libcreaterepo_c.so.0:db_index_primary_tables
-libcreaterepo_c.so.0:db_package_ids_prepare
-libcreaterepo_c.so.0:db_package_ids_write
-libcreaterepo_c.so.0:db_package_prepare
-libcreaterepo_c.so.0:db_package_write
-libcreaterepo_c.so.0:dump_base_items
-libcreaterepo_c.so.0:dump_changelog
-libcreaterepo_c.so.0:dump_data_items
-libcreaterepo_c.so.0:dump_filelists_items
-libcreaterepo_c.so.0:dump_other_items
-libcreaterepo_c.so.0:dump_pco
-libcreaterepo_c.so.0:fil_char_handler
-libcreaterepo_c.so.0:fil_end_handler
-libcreaterepo_c.so.0:fil_start_handler
-libcreaterepo_c.so.0:free_list_of_md_locations
-libcreaterepo_c.so.0:free_old_file
-libcreaterepo_c.so.0:free_values
-libcreaterepo_c.so.0:get_compressed_content_stat
-libcreaterepo_c.so.0:get_list_of_md_locations
-libcreaterepo_c.so.0:get_local_metadata
-libcreaterepo_c.so.0:get_remote_metadata
-libcreaterepo_c.so.0:load_xml_files
-libcreaterepo_c.so.0:oth_char_handler
-libcreaterepo_c.so.0:oth_end_handler
-libcreaterepo_c.so.0:oth_start_handler
-libcreaterepo_c.so.0:parse_repomd
-libcreaterepo_c.so.0:pri_char_handler
-libcreaterepo_c.so.0:pri_end_handler
-libcreaterepo_c.so.0:pri_start_handler
-libcreaterepo_c.so.0:remove_listed_files
-libcreaterepo_c.so.0:repomd_xml_dump
-libcreaterepo_c.so.0:stat_and_insert
+libcreaterepo_c.so.0:cr_xml_dump_primary_base_items
+libcreaterepo_c.so.0:cr_xml_dump_primary_dump_pco
+libcreaterepo_c.so.0:cr_xml_dump_repomd
+libcreaterepo_c.so.0:cr_xml_dump_repomd_body
+libcreaterepo_c.so.0:cr_xml_dump_repomd_record
+libcreaterepo_c.so.0:cr_xml_dump_updatecollectionpackages
+libcreaterepo_c.so.0:cr_xml_dump_updateinfo
+libcreaterepo_c.so.0:cr_xml_dump_updateinfo_body
+libcreaterepo_c.so.0:cr_xml_dump_updateinforecord_internal
+libcreaterepo_c.so.0:cr_xml_dump_updateinforecord_pkglist
+libcreaterepo_c.so.0:cr_xml_dump_updateinforecord_references
+libcreaterepo_c.so.0:cr_xml_dump_updaterecord
+libcreaterepo_c.so.0:cr_xml_from_rpm
+libcreaterepo_c.so.0:cr_xml_parse_filelists
+libcreaterepo_c.so.0:cr_xml_parse_other
+libcreaterepo_c.so.0:cr_xml_parse_primary
+libcreaterepo_c.so.0:cr_xml_parse_repomd
+libcreaterepo_c.so.0:cr_xml_parse_updateinfo
+libcreaterepo_c.so.0:cr_xml_parser_data
+libcreaterepo_c.so.0:cr_xml_parser_data_free
+libcreaterepo_c.so.0:cr_xml_parser_generic
+libcreaterepo_c.so.0:cr_xml_parser_strtoll
+libcreaterepo_c.so.0:cr_xml_parser_warning
+libcreaterepo_c.so.0:cr_xmlfile_add_chunk
+libcreaterepo_c.so.0:cr_xmlfile_add_pkg
+libcreaterepo_c.so.0:cr_xmlfile_close
+libcreaterepo_c.so.0:cr_xmlfile_set_num_of_pkgs
+libcreaterepo_c.so.0:cr_xmlfile_sopen
+libcreaterepo_c.so.0:cr_xmlfile_write_xml_footer
+libcreaterepo_c.so.0:cr_xmlfile_write_xml_header
+libcreaterepo_c.so.0:createrepo_c_error_quark
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,13 +1,14 @@
libbz2.so.1.0
libc.so.6
+libcrypto.so.1.0.0
libcurl.so.4
libexpat.so.1
libglib-2.0.so.0
libgthread-2.0.so.0
liblzma.so.5
libmagic.so.1
-librpm.so.3
-librpmio.so.3
+librpm.so.8
+librpmio.so.8
libsqlite3.so.0
libxml2.so.2
libz.so.1
diff --git a/files/0001-Fix-broken-prefix-usage.patch b/files/0001-Fix-broken-prefix-usage.patch
deleted file mode 100644
--- a/files/0001-Fix-broken-prefix-usage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a39da6bd2f144af9ca8eccd6597ec5948b0a94 Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Fri, 21 Aug 2015 10:20:56 +0100
-Subject: [PATCH] Fix broken prefix usage
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9934c8..88b1032 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -155,7 +155,7 @@ INCLUDE(CPack)
-
- # Other files
-
--SET(CMAKE_INSTALL_PREFIX "/")
-+SET(CMAKE_INSTALL_PREFIX "")
- INSTALL(FILES README COPYING
- DESTINATION "/usr/share/doc/createrepo_c-${VERSION}")
- INSTALL(FILES createrepo_c.bash
---
-2.5.0
-
diff --git a/files/createrepo_c-PR70.patch b/files/createrepo_c-PR70.patch
new file mode 100644
--- /dev/null
+++ b/files/createrepo_c-PR70.patch
@@ -0,0 +1,76 @@
+From 375cb752bc2ce1e2d7ecb898f926b5f33933b9f0 Mon Sep 17 00:00:00 2001
+From: Tomas Mlcoch <tmlcoch@redhat.com>
+Date: Mon, 26 Dec 2016 10:44:05 +0100
+Subject: [PATCH] Consider versions during dep filtering for requires/provides
+ (Issue #67)
+
+This should avoid situations where a package provides and requires same
+capability (a dependency) with different versions but createrepo_c
+strip the require down (because it already saw it in provides).
+
+This should fix the issue in a better way than PR #68
+---
+ src/parsehdr.c | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/parsehdr.c b/src/parsehdr.c
+index ceaf884..5a14f7b 100644
+--- a/src/parsehdr.c
++++ b/src/parsehdr.c
+@@ -319,7 +319,10 @@ cr_package_from_header(Header hdr,
+ };
+
+ // Hastable with filenames from provided
+- GHashTable *provided_hashtable = g_hash_table_new(g_str_hash, g_str_equal);
++ GHashTable *provided_hashtable = g_hash_table_new_full(g_str_hash,
++ g_str_equal,
++ g_free,
++ NULL);
+
+ // Hashtable with already processed files from requires
+ GHashTable *ap_hashtable = g_hash_table_new_full(g_str_hash,
+@@ -350,6 +353,12 @@ cr_package_from_header(Header hdr,
+ const char *flags = cr_flag_to_str(num_flags);
+ const char *full_version = rpmtdGetString(fileversions);
+
++ _cleanup_free_ char *depnfv = NULL; // Dep NameFlagsVersion
++ depnfv = g_strconcat(filename,
++ flags ? flags : "",
++ full_version ? full_version : "",
++ NULL);
++
+ // Requires specific stuff
+ if (deptype == DEP_REQUIRES) {
+ // Skip requires which start with "rpmlib("
+@@ -358,14 +367,14 @@ cr_package_from_header(Header hdr,
+ }
+
+ // Skip package primary files
+- if (g_hash_table_lookup_extended(filenames_hashtable, filename, NULL, NULL)) {
++ if (*filename == '/' && g_hash_table_lookup_extended(filenames_hashtable, filename, NULL, NULL)) {
+ if (cr_is_primary(filename)) {
+ continue;
+ }
+ }
+
+ // Skip files which are provided
+- if (g_hash_table_lookup_extended(provided_hashtable, filename, NULL, NULL)) {
++ if (g_hash_table_lookup_extended(provided_hashtable, depnfv, NULL, NULL)) {
+ continue;
+ }
+
+@@ -412,10 +421,12 @@ cr_package_from_header(Header hdr,
+ g_free(evr);
+
+ switch (deptype) {
+- case DEP_PROVIDES:
+- g_hash_table_replace(provided_hashtable, dependency->name, dependency->name);
++ case DEP_PROVIDES: {
++ char *depnfv_dup = g_strdup(depnfv);
++ g_hash_table_replace(provided_hashtable, depnfv_dup, NULL);
+ pkg->provides = g_slist_prepend(pkg->provides, dependency);
+ break;
++ }
+ case DEP_CONFLICTS:
+ pkg->conflicts = g_slist_prepend(pkg->conflicts, dependency);
+ break;
diff --git a/files/createrepo_c-add-switch-to-turn-off-python.patch b/files/createrepo_c-add-switch-to-turn-off-python.patch
new file mode 100644
--- /dev/null
+++ b/files/createrepo_c-add-switch-to-turn-off-python.patch
@@ -0,0 +1,49 @@
+From bbc0a82b60afff3a87e060c5289979081d58708f Mon Sep 17 00:00:00 2001
+From: Frank Schreiner <schreiner@suse.de>
+Date: Thu, 14 Apr 2016 12:19:18 +0200
+Subject: [PATCH] added switch to turn of python support
+
+---
+ CMakeLists.txt | 2 ++
+ src/CMakeLists.txt | 2 ++
+ tests/CMakeLists.txt | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c4f06f8..8c78d6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,6 +90,8 @@ INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake)
+ SET (VERSION "${CR_MAJOR}.${CR_MINOR}.${CR_PATCH}")
+ message("Package version: ${VERSION}")
+
++# option to enable/disable python support
++OPTION (ENABLE_PYTHON "Enable python support?" ON)
+
+ # Default python version
+ if (NOT PYTHON_DESIRED)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 33ac9c8..f3635e8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -120,4 +120,6 @@ INSTALL(TARGETS mergerepo_c DESTINATION bin/)
+ INSTALL(TARGETS modifyrepo_c DESTINATION bin/)
+ INSTALL(TARGETS sqliterepo_c DESTINATION bin/)
+
++IF (ENABLE_PYTHON)
+ ADD_SUBDIRECTORY(python)
++ENDIF (ENABLE_PYTHON)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index d61bb86..aeefe59 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -37,4 +37,6 @@ ADD_DEPENDENCIES(tests test_xml_parser_updateinfo)
+ CONFIGURE_FILE("run_gtester.sh.in" "${CMAKE_BINARY_DIR}/tests/run_gtester.sh")
+ ADD_TEST(test_main run_gtester.sh)
+
++IF (ENABLE_PYTHON)
+ ADD_SUBDIRECTORY(python)
++ENDIF (ENABLE_PYTHON)
+--
+2.14.2
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,19 +1,24 @@
name : createrepo_c
-version : 0.1.14
-release : 3
+version : 0.10.0
+release : 4
source :
- - https://fedorahosted.org/releases/c/r/createrepo_c/createrepo_c-0.1.14.tar.xz : a3f545d45575ba5a70f68b174354dd6e6df096e30f2cab24bbe98b36d0f6527f
+ - https://github.com/rpm-software-management/createrepo_c/archive/0.10.0/createrepo_c-0.10.0.tar.gz : 510d1006294c2cfc7e6e01a5ffa243ac8b8e8cdb045efadfebb5c03f0251adaa
license : GPL-2.0
summary : C implementation of the createrepo.
+component : programming.devel
description: |
C implementation of the createrepo.
clang : no
builddeps :
+ - pkgconfig(libcurl)
- pkgconfig(sqlite3)
+ - pkgconfig(popt)
- pkgconfig(rpm)
+ - bzip2-devel
setup : |
- %patch -p1 < $pkgfiles/0001-Fix-broken-prefix-usage.patch
- %cmake .
+ %patch -p1 < $pkgfiles/createrepo_c-PR70.patch
+ %patch -p1 < $pkgfiles/createrepo_c-add-switch-to-turn-off-python.patch
+ %cmake . -DENABLE_PYTHON=OFF
build : |
%make
install : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,10 +2,11 @@
<Source>
<Name>createrepo_c</Name>
<Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Neal Gompa</Name>
+ <Email>ngompa13@gmail.com</Email>
</Packager>
<License>GPL-2.0</License>
+ <PartOf>programming.devel</PartOf>
<Summary xml:lang="en">C implementation of the createrepo.</Summary>
<Description xml:lang="en">C implementation of the createrepo.
</Description>
@@ -18,11 +19,13 @@
</Description>
<PartOf>programming.devel</PartOf>
<Files>
- <Path fileType="library">/usr/lib/lib*.so.*</Path>
<Path fileType="executable">/usr/bin</Path>
- <Path fileType="doc">/usr/share/doc</Path>
+ <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+ <Path fileType="data">/usr/share/bash-completion/completions/createrepo_c</Path>
+ <Path fileType="data">/usr/share/bash-completion/completions/mergerepo_c</Path>
+ <Path fileType="data">/usr/share/bash-completion/completions/modifyrepo_c</Path>
+ <Path fileType="data">/usr/share/bash-completion/completions/sqliterepo_c</Path>
<Path fileType="man">/usr/share/man</Path>
- <Path fileType="config">/etc/bash_completion.d/createrepo_c.bash</Path>
</Files>
</Package>
<Package>
@@ -32,21 +35,21 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="current">createrepo_c</Dependency>
+ <Dependency release="4">createrepo_c</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="header">/usr/include</Path>
- <Path fileType="library">/usr/lib/lib*.so</Path>
- <Path fileType="data">/usr/lib/pkgconfig</Path>
+ <Path fileType="header">/usr/include/</Path>
+ <Path fileType="library">/usr/lib64/lib*.so</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
</Files>
</Package>
<History>
- <Update release="3">
- <Date>2016-03-08</Date>
- <Version>0.1.14</Version>
+ <Update release="4">
+ <Date>2017-12-25</Date>
+ <Version>0.10.0</Version>
<Comment>Packaging update</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Neal Gompa</Name>
+ <Email>ngompa13@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 5, 1:01 AM (3 d, 14 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5868095
Default Alt Text
D1764.diff (22 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.