packages/dialog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1 del patch to be consistent with open source

Browse Source 
Merge pull request !1 from zxx/develop
This commit is contained in:
openeuler-ci-bot 2020-01-13 09:31:50 +08:00 committed by Gitee
commit 5bcbe49dd0
4 changed files with 5 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dialog-incdir.patch
View File

@ -1,23 +0,0 @@
diff -up dialog-1.1-20110707/dialog-config.in.incdir dialog-1.1-20110707/dialog-config.in
--- dialog-1.1-20110707/dialog-config.in.incdir 2011-01-06 10:38:03.000000000 +0100
+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:00:02.692038027 +0200
@@ -35,6 +35,7 @@ bindir="@bindir@"
libdir="@libdir@"
datadir="@datadir@"
mandir="@mandir@"
+includedir="@includedir@"
THIS="@PACKAGE@"
@@ -67,10 +68,7 @@ while test $# -gt 0; do
;;
# compile/link
--cflags)
- INCS=
- if test "${prefix}/include" != /usr/include ; then
- INCS="-I${prefix}/include"
- fi
+ INCS="-I$includedir"
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$INCS
ENDECHO

12
dialog-libs.patch
View File

@ -1,12 +0,0 @@
diff -up dialog-1.3-20170131/makefile.in.libs dialog-1.3-20170131/makefile.in
--- dialog-1.3-20170131/makefile.in.libs 2017-02-01 13:24:22.300746602 +0100
+++ dialog-1.3-20170131/makefile.in 2017-02-01 13:25:22.200905261 +0100
@@ -203,7 +203,7 @@ dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS) $(LIBS)
+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS)
clean \
distclean \

21
dialog-multilib.patch
View File

@ -1,21 +0,0 @@
diff -up dialog-1.2-20121230/dialog-config.in.multilib dialog-1.2-20121230/dialog-config.in
--- dialog-1.2-20121230/dialog-config.in.multilib 2013-03-18 15:43:10.639021412 +0100
+++ dialog-1.2-20121230/dialog-config.in 2013-03-18 15:44:08.519065774 +0100
@@ -33,7 +33,7 @@ exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
bindir="@bindir@"
-libdir="@libdir@"
+libdir=
datadir="@datadir@"
mandir="@mandir@"
includedir="@includedir@"
@@ -76,7 +76,7 @@ ENDECHO
;;
--libs)
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- -L${exec_prefix}/lib -l${THIS} @LIBS@
+ -l${THIS}
ENDECHO
;;
# identification

10
dialog.spec
View File

@ -1,14 +1,11 @@
%global dialogsubversion 20180621
Name: dialog
Version: 1.3
Release: 16
Release: 17
Summary: A utility which displays dialog boxes from shell scripts
License: LGPLv2
URL: https://invisible-island.net/dialog/dialog.html
Source0: https://invisible-island.net/datafiles/release/dialog-%{version}-%{dialogsubversion}.tgz
Patch0: dialog-incdir.patch
Patch1: dialog-multilib.patch
Patch2: dialog-libs.patch
BuildRequires: gcc ncurses-devel gettext findutils libtool
Provides: dialog-static
@ -87,5 +84,8 @@ chmod 755 %{buildroot}%{_libdir}/libdialog.so.*.*.*
%{_mandir}/man3/dialog.*
%changelog
* Sat Jan 11 2020 zhangguangzhi<zhangguangzhi3@huawei.com> - 1.3-17
- del patch to be consistent with open source
* Thu Sep 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.3-16
- Package init
- Package init