diff options
author | Elan Ruusamäe | 2013-05-07 08:54:47 (GMT) |
---|---|---|
committer | Elan Ruusamäe | 2013-05-07 08:54:47 (GMT) |
commit | dcdcebb74ae61a21eabc5d81ab87dbbb456df499 (patch) | |
tree | 6682bee1136bde2e197cd63a4fd588386d8016ee | |
parent | 1e0595d6832f4b3d1c11a5f040fcd9cfbcddbd94 (diff) | |
download | poldek-dcdcebb74ae61a21eabc5d81ab87dbbb456df499.zip poldek-dcdcebb74ae61a21eabc5d81ab87dbbb456df499.tar.gz |
install poldek internal scripts to /usr/lib/poldek making noarch addons possibleauto/th/poldek-0.30.0-1.rc7.4
-rw-r--r-- | pkglibdir.patch | 25 | ||||
-rw-r--r-- | poldek.spec | 11 |
2 files changed, 33 insertions, 3 deletions
diff --git a/pkglibdir.patch b/pkglibdir.patch new file mode 100644 index 0000000..46dedf4 --- /dev/null +++ b/pkglibdir.patch @@ -0,0 +1,25 @@ +--- poldek-0.30.0/configure.ac~ 2013-03-09 13:14:38.000000000 +0200 ++++ poldek-0.30.0/configure.ac 2013-05-07 11:18:01.889839519 +0300 +@@ -574,7 +574,10 @@ + AC_SUBST(SYSCONFDIR) + + +-PKGLIBDIR="`echo $libdir/$PACKAGE`" ++AC_ARG_WITH(pkglibdir, ++[ --with-pkglibdir program executables], ++PKGLIBDIR=$withval, PKGLIBDIR="`echo $libdir/$PACKAGE`") ++ + while echo ${PKGLIBDIR} | grep '\$' >/dev/null; do + PKGLIBDIR=$(eval echo ${PKGLIBDIR}); + done +--- poldek-0.30.0/Makefile.am~ 2013-03-05 14:05:24.000000000 +0200 ++++ poldek-0.30.0/Makefile.am 2013-05-07 11:47:28.936268884 +0300 +@@ -78,7 +78,7 @@ + + LDADD_ = @INTLLIBS@ + +-vfscriptsdir = $(libdir)/$(PACKAGE_NAME) ++vfscriptsdir = $(PKGLIBDIR) + vfscripts_SCRIPTS = zlib-in-rpm.sh vfjuggle vfcompr vfsmb poldekuser-setup.sh + + EXTRA_DIST = \ diff --git a/poldek.spec b/poldek.spec index 16f3017..0da7873 100644 --- a/poldek.spec +++ b/poldek.spec @@ -15,7 +15,7 @@ %define ver_rpm 5.4.10 %define snap rc7 -%define rel 3%{?with_snap:.%{SNAP}} +%define rel 4%{?with_snap:.%{SNAP}} 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 @@ -45,6 +45,7 @@ Patch2: %{name}-size-type.patch Patch3: %{name}-Os-fail-workaround.patch Patch4: %{name}-git.patch Patch5: %{name}-inherited-group.patch +Patch6: pkglibdir.patch URL: http://poldek.pld-linux.org/ BuildRequires: autoconf BuildRequires: automake @@ -93,6 +94,8 @@ Requires: rpm-lib >= 5.4.10 Requires: sed BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _libexecdir %{_prefix}/lib/%{name} + %description poldek is an RPM package management tool which allows you to easily perform package verification, installation (including system @@ -209,6 +212,7 @@ Moduły języka Python dla poldka. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %{__rm} m4/libtool.m4 m4/lt*.m4 @@ -240,6 +244,7 @@ CPPFLAGS="%{rpmcppflags} -std=gnu99" %configure \ %{?with_static:--enable-static --disable-shared} \ %{!?with_imode:--disable-imode} \ + --with-pkglibdir=%{_libexecdir} \ --enable-nls \ %{?with_python:--with-python} %{__make} -j1 @@ -459,8 +464,8 @@ fi %attr(755,root,root) %{_bindir}/ipoldek %attr(755,root,root) %{_bindir}/poldek %attr(755,root,root) %{_bindir}/rpmvercmp -%dir %{_libdir}/%{name} -%attr(755,root,root) %{_libdir}/%{name}/* +%dir %{_libexecdir} +%attr(755,root,root) %{_libexecdir}/* %{_mandir}/man1/%{name}*.1* %lang(pl) %{_mandir}/pl/man1/%{name}* %{_infodir}/poldek.info* |