From: Marcin Krol Date: Fri, 1 Aug 2014 11:40:50 +0000 (+0000) Subject: - updated to 0.30.1 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=aa08c537e4f0ab32ce64139dd8f876ad62631567;p=packages%2Fpoldek.git - updated to 0.30.1 --- diff --git a/poldek-Os-fail-workaround.patch b/poldek-Os-fail-workaround.patch deleted file mode 100644 index 7bf430f..0000000 --- a/poldek-Os-fail-workaround.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- poldek-0.30/cli/shell.c~ 2010-11-25 22:30:09.000000000 +0100 -+++ poldek-0.30/cli/shell.c 2011-02-06 20:20:23.502000232 +0100 -@@ -18,6 +18,13 @@ - # include "config.h" - #endif - -+#ifndef __USE_EXTERN_INLINES -+# define __USE_EXTERN_INLINES -+# include -+# undef __USE_EXTERN_INLINES -+#else -+# include -+#endif - #include - #include - #include -@@ -28,7 +35,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/poldek.spec b/poldek.spec index e7e233a..ce37bde 100644 --- a/poldek.spec +++ b/poldek.spec @@ -10,30 +10,29 @@ %define ver_db_rel 3 %define ver_rpm 4.5-71 -%define rel 2 +%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.30.0 +Version: 0.30.1 Release: %{rel} License: GPL v2 Group: Applications/System #Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2 Source0: http://carme.pld-linux.org/~megabajt/releases/poldek/%{name}-%{version}.tar.xz -# Source0-md5: 392cfa125912fbedb6cc6d54dfbb80e3 +# Source0-md5: e569c8454df0932df53b09cee9998927 Source1: %{name}.conf Source2: %{name}-multilib.conf Source5: %{name}-aliases.conf Source6: %{name}.desktop Source7: %{name}.png Patch0: %{name}-size-type.patch -Patch1: %{name}-Os-fail-workaround.patch -Patch2: %{name}-config.patch +Patch1: %{name}-config.patch URL: http://poldek.pld-linux.org/ BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel} BuildRequires: autoconf -BuildRequires: automake +BuildRequires: automake >= 1:1.11 BuildRequires: bzip2-devel BuildRequires: check-devel BuildRequires: docbook-dtd412-xml @@ -58,7 +57,6 @@ BuildRequires: zlib-devel BuildRequires: %{db_pkg}-static >= %{ver_db}-%{ver_db_rel} BuildRequires: bzip2-static BuildRequires: glibc-static -BuildRequires: libselinux-static BuildRequires: libxml2-static BuildRequires: ncurses-static BuildRequires: openssl-static @@ -194,7 +192,6 @@ Moduły języka Python dla poldka. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %{__rm} m4/libtool.m4 m4/lt*.m4 @@ -203,6 +200,7 @@ find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f chmod u+x ./configure ./doc/conf-xml2.sh %build +%{__gettextize} %{__libtoolize} %{__aclocal} -I m4 %{__autoheader} @@ -222,7 +220,7 @@ cd ../trurlib %{__automake} cd .. -CPPFLAGS="%{rpmcppflags} -std=gnu99" +CPPFLAGS="%{rpmcppflags} -std=gnu99 -fgnu89-inline" %configure \ %{?with_static:--enable-static --disable-shared} \ %{!?with_imode:--disable-imode} \