From: mis Date: Mon, 2 Mar 2020 09:51:04 +0000 (+0100) Subject: up to 0.42.0 (source repo moved to github) X-Git-Tag: auto/th/poldek-0.42.0-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fpoldek.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fpoldek-0.42.0-1 up to 0.42.0 (source repo moved to github) --- diff --git a/multiple-options.patch b/multiple-options.patch deleted file mode 100644 index 7ba67b3..0000000 --- a/multiple-options.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- poldek-0.32.2/conf.c~ 2016-01-30 15:05:57.000000000 +0100 -+++ poldek-0.32.2/conf.c 2018-08-11 18:43:17.635821800 +0200 -@@ -1226,8 +1226,12 @@ tn_hash *poldek_conf_addlines(tn_hash *h - n_strdupap(line, &tmp); - - if (split_option_line(tmp, &name, &value, NULL, 0)) { -+ unsigned add_flags = ADD_PARAM_VALIDATE; -+ // allow multiple rpmdef values -+ if (strcmp(name, "rpmdef") != 0) -+ add_flags |= ADD_PARAM_OVERWRITE; - if (!add_param(ht_sect, sectnam, name, value, -- ADD_PARAM_VALIDATE | ADD_PARAM_OVERWRITE, NULL, 0)) -+ add_flags, NULL, 0)) - nerr++; - } - } diff --git a/pm-hooks.patch b/pm-hooks.patch index 9a7d33b..193addf 100644 --- a/pm-hooks.patch +++ b/pm-hooks.patch @@ -2,7 +2,7 @@ this could be handled natively by poldek but implement as "pm command" hack for now --- /dev/null 2015-05-20 12:11:30.089022100 +0300 -+++ poldek/pm-command.sh 2015-05-31 18:21:15.748917981 +0300 ++++ poldek/scripts/pm-command.sh 2015-05-31 18:21:15.748917981 +0300 @@ -0,0 +1,11 @@ +#!/bin/sh +# wrapper to add pre-install.d and post-install.d support for pm command in poldek @@ -27,18 +27,18 @@ but implement as "pm command" hack for now --- poldek-0.30.1/conf/poldek.conf~ 2015-05-31 18:25:35.000000000 +0300 +++ poldek-0.30.1/conf/poldek.conf 2015-05-31 18:26:28.410188923 +0300 @@ -56,7 +56,7 @@ - #exclude path = - + #exclude path = + # Full path name to a PM (rpm for now) binary. -#pm command = /bin/rpm +pm command = /usr/lib/poldek/pm-command.sh - + # Full path name to sudo binary. #sudo command = /usr/bin/sudo --- poldek-0.30.1/conf/Makefile.am 2015-05-31 18:28:29.319806773 +0300 +++ poldek-0.30.1/conf/Makefile.am 2015-05-31 19:12:22.206571793 +0300 @@ -26,6 +26,10 @@ - + install-data-local: $(GENCONFIGS) $(MKDIR_P) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/repos.d + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/pre-install.d @@ -52,10 +52,10 @@ but implement as "pm command" hack for now +++ poldek-0.30.1/Makefile.am 2015-05-31 19:10:22.240340180 +0300 @@ -79,7 +79,7 @@ LDADD_ = @INTLLIBS@ - + vfscriptsdir = $(PKGLIBDIR) --vfscripts_SCRIPTS = zlib-in-rpm.sh vfjuggle vfcompr vfsmb poldekuser-setup.sh -+vfscripts_SCRIPTS = zlib-in-rpm.sh vfjuggle vfcompr vfsmb poldekuser-setup.sh pm-command.sh - +-vfscripts_SCRIPTS = scripts/zlib-in-rpm.sh scripts/vfjuggle scripts/vfcompr scripts/vfsmb scripts/poldekuser-setup.sh ++vfscripts_SCRIPTS = scripts/zlib-in-rpm.sh scripts/vfjuggle scripts/vfcompr scripts/vfsmb scripts/poldekuser-setup.sh scripts/pm-command.sh + EXTRA_DIST = \ $(vfscripts_SCRIPTS) \ diff --git a/poldek.spec b/poldek.spec index b879afa..ce813e1 100644 --- a/poldek.spec +++ b/poldek.spec @@ -26,18 +26,18 @@ %define ver_rpm 5.4.10 %endif -%define rel 3 +%define rel 1 Summary: RPM packages management helper tool Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM Name: poldek -Version: 0.40.0 +Version: 0.42.0 Release: %{rel}%{?with_snap:.%{SNAP}} License: GPL v2 Group: Applications/System #Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2 -Source0: https://launchpad.net/poldek/master/head/+download/%{name}-%{version}.tar.xz -# Source0-md5: c88f3ada99799d0e1af78aeda428d041 +Source0: https://github.com/poldek-pm/poldek/releases/download/v%{version}/%{name}-%{version}.tar.xz +# Source0-md5: f224a4f62cdedf0d8bcfe0ce6dd533b2 Source1: %{name}.conf Source2: %{name}-multilib.conf Source3: %{name}-config.sh @@ -55,8 +55,6 @@ Source102: %{name}-debuginfo-snap.conf Patch0: %{name}-config.patch Patch1: pm-hooks.patch Patch2: poldek-ext-down-enable.patch -Patch3: multiple-options.patch -Patch4: rpm.org-system-db.patch URL: http://poldek.pld-linux.org/ BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel} BuildRequires: autoconf @@ -226,8 +224,6 @@ Moduły języka Python dla poldka. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %{__rm} m4/libtool.m4 m4/lt*.m4 @@ -485,7 +481,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc ChangeLog README* NEWS TODO configs +%doc ChangeLog README* NEWS configs %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/pre-install.d %{_sysconfdir}/%{name}/pre-install.d/README @@ -522,8 +518,8 @@ fi %attr(755,root,root) %{_libdir}/libtndb.so.*.*.* %attr(755,root,root) %{_libdir}/libtrurl.so.*.*.* %attr(755,root,root) %{_libdir}/libvfile.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpoclidek.so.0 -%attr(755,root,root) %ghost %{_libdir}/libpoldek.so.2 +%attr(755,root,root) %ghost %{_libdir}/libpoclidek.so.1 +%attr(755,root,root) %ghost %{_libdir}/libpoldek.so.3 %attr(755,root,root) %ghost %{_libdir}/libtndb.so.0 %attr(755,root,root) %ghost %{_libdir}/libtrurl.so.0 %attr(755,root,root) %ghost %{_libdir}/libvfile.so.0 diff --git a/rpm.org-system-db.patch b/rpm.org-system-db.patch deleted file mode 100644 index 6762e3f..0000000 --- a/rpm.org-system-db.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- poldek-0.40.0/configure.ac~ 2019-12-30 10:21:37.000000000 +0100 -+++ poldek-0.40.0/configure.ac 2020-01-26 10:38:55.479795637 +0100 -@@ -335,11 +335,15 @@ - # DBLIB="$DBLIB -ldb1" - #fi - else -+ if test "${is_rpmorg}." = "yes."; then -+ AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS]) -+ else - AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4" DBINCLUDE="-I/usr/include/db4"], - [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1" DBINCLUDE="-I/usr/include/db4.1"], - [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"], - [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])], - [$LIBS])],, [$LIBS])],, [$LIBS]) -+ fi - - if test "${ENABLE_STATIC}." = "yes."; then - DBLIB="$DBLIB"