commit d50a0a9a6e034c6f53bb4330924ba1a8c19c6517
Author: Jakub Bogusz <[email protected]>
Date: Tue Jul 9 18:37:48 2013 +0200
- cleanup, removed obsolete libtool patch
dialog.spec | 16 +++++++---------
libtool.patch | 38 --------------------------------------
2 files changed, 7 insertions(+), 47 deletions(-)
---
diff --git a/dialog.spec b/dialog.spec
index 5337877..535490d 100644
--- a/dialog.spec
+++ b/dialog.spec
@@ -16,7 +16,6 @@ Source0:
ftp://invisible-island.net/dialog/%{name}-%{ver}-%{sdate}.tgz
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 932081790cd8aa857822bd2b0eafa5bb
Patch0: %{name}-link.patch
-Patch1: libtool.patch
URL: http://invisible-island.net/dialog/dialog.html
BuildRequires: gettext-devel
BuildRequires: libtool
@@ -84,15 +83,13 @@ Statyczna biblioteka dialog.
%prep
%setup -q -n %{name}-%{ver}-%{sdate}
%patch0 -p1
-#%patch1 -p1
-mv aclocal.m4 acinclude.m4
%build
%configure \
--with-libtool \
--with-ncursesw \
- --enable-widec \
- --enable-nls
+ --enable-nls \
+ --enable-widec
%{__make}
@@ -121,16 +118,17 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/dialog
%attr(755,root,root) %{_libdir}/libdialog.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libdialog.so.11
-%{_mandir}/man1/*
-%lang(hu) %{_mandir}/hu/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%{_mandir}/man1/dialog.1*
+%lang(hu) %{_mandir}/hu/man1/dialog.1*
+%lang(pl) %{_mandir}/pl/man1/dialog.1*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/dialog-config
%attr(755,root,root) %{_libdir}/libdialog.so
%{_libdir}/libdialog.la
-%{_includedir}/*.h
+%{_includedir}/dialog.h
+%{_includedir}/dlg_*.h
%{_mandir}/man3/dialog.3*
%dir %{_examplesdir}/%{name}-%{version}
%{_examplesdir}/%{name}-%{version}/README
diff --git a/libtool.patch b/libtool.patch
deleted file mode 100644
index 7d8692c..0000000
--- a/libtool.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur dialog-1.1-20100119/aclocal.m4 dialog-1.1-20100119.new/aclocal.m4
---- dialog-1.1-20100119/aclocal.m4 2010-01-18 02:38:22.000000000 +0100
-+++ dialog-1.1-20100119.new/aclocal.m4 2010-01-20 12:14:13.633490244 +0100
-@@ -3741,12 +3741,12 @@
- AC_MSG_ERROR(Cannot find libtool)
- fi
- ])dnl
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir}
${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF}
$(LIBS) -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link --tag=CC ${CC} ${CC} -rpath
${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION`
${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-- LIB_COMPILE='${LIBTOOL} --mode=compile'
-- LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
-+ LIB_COMPILE='${LIBTOOL} --mode=compile --tag=CC ${CC}'
-+ LIB_LINK='${LIBTOOL} --mode=link --tag=CC ${CC} ${CC} ${LIBTOOL_OPTS}'
- LIB_INSTALL='${LIBTOOL} --mode=install'
- LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
- LIB_PREP=:
-diff -ur dialog-1.1-20100119/configure dialog-1.1-20100119.new/configure
---- dialog-1.1-20100119/configure 2010-01-19 11:36:35.000000000 +0100
-+++ dialog-1.1-20100119.new/configure 2010-01-20 12:14:58.156816637 +0100
-@@ -9118,12 +9118,12 @@
- echo "$as_me: error: Cannot find libtool" >&2;}
- { (exit 1); exit 1; }; }
- fi
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir}
${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF}
$(LIBS) -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link --tag=CC ${CC} ${CC} -rpath
${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION`
${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-- LIB_COMPILE='${LIBTOOL} --mode=compile'
-- LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
-+ LIB_COMPILE='${LIBTOOL} --mode=compile --tag=CC ${CC}'
-+ LIB_LINK='${LIBTOOL} --mode=link --tag=CC ${CC} ${CC} ${LIBTOOL_OPTS}'
- LIB_INSTALL='${LIBTOOL} --mode=install'
- LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
- LIB_PREP=:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dialog.git/commitdiff/d50a0a9a6e034c6f53bb4330924ba1a8c19c6517
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
