[packages/smbc] - rel 6; build fixed
arekm
arekm at pld-linux.org
Sat Dec 12 21:10:25 CET 2015
commit 023a464db5ffadd9f932963b2f3bac53dccf2a1c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Dec 12 21:10:20 2015 +0100
- rel 6; build fixed
smbc-build.patch | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
smbc.spec | 9 +++--
2 files changed, 107 insertions(+), 2 deletions(-)
---
diff --git a/smbc.spec b/smbc.spec
index d569d78..a358c56 100644
--- a/smbc.spec
+++ b/smbc.spec
@@ -2,12 +2,13 @@ Summary: Simple Samba Commander
Summary(pl.UTF-8): Konsolowa przeglądarka otoczenia sieciowego
Name: smbc
Version: 1.2.2
-Release: 5
+Release: 6
License: GPL
Group: Applications/Networking
Source0: http://dl.sourceforge.net/smbc/%{name}-%{version}.tgz
# Source0-md5: f5c1a16ea0378d96cb27e8d96229e8ad
Source1: %{name}.desktop
+Patch0: %{name}-build.patch
URL: http://smbc.airm.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -39,18 +40,22 @@ znaków UTF8.
%prep
%setup -q
+%patch0 -p1
+
rm -rf src/CVS
sed -i 's@<curses.h>@<ncurses/curses.h>@' src/*
%build
%{__gettextize}
%{__libtoolize}
+sed -i -e 's#-Werror##g' -e 's#-Wformat##g' */*.m4
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ CPPFLAGS="%{rpmcppflags} $(pkg-config --cflags smbclient)"
%{__make}
diff --git a/smbc-build.patch b/smbc-build.patch
new file mode 100644
index 0000000..83713c7
--- /dev/null
+++ b/smbc-build.patch
@@ -0,0 +1,100 @@
+--- smbc-1.2.2/configure.in~ 2005-06-29 14:14:02.000000000 +0200
++++ smbc-1.2.2/configure.in 2015-12-12 17:56:51.436162981 +0100
+@@ -65,6 +65,8 @@ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
+
++AC_SYS_LARGEFILE
++
+ # Checks for library functions.
+ AC_FUNC_CLOSEDIR_VOID
+ AC_FUNC_FORK
+--- smbc-1.2.2/src/Makefile.am~ 2015-12-12 17:55:12.000000000 +0100
++++ smbc-1.2.2/src/Makefile.am 2015-12-12 17:56:17.811965608 +0100
+@@ -17,13 +17,6 @@ smbc_SOURCES = smbc.c \
+ downloadlist.c downloadlist.h \
+ smb-ext.c smb-ext.h
+
+-smbc_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall
+-CFLAGS = -O3
+-
+-if GDB
+- smbc_CFLAGS += -ggdb -g
+-endif
+-
+ smbc_LDADD = @LIBINTL@
+
+ localedir = $(prefix)/share/locale
+--- smbc-1.2.2/src/Makefile.am~ 2015-12-12 17:57:36.000000000 +0100
++++ smbc-1.2.2/src/Makefile.am 2015-12-12 17:58:44.515735450 +0100
+@@ -21,5 +21,5 @@ smbc_LDADD = @LIBINTL@
+
+ localedir = $(prefix)/share/locale
+ mandir = $(prefix)/share/man
+-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
++INCLUDES = $(CPPFLAGS) -I../intl -DLOCALEDIR=\"$(localedir)\"
+
+--- smbc-1.2.2/src/smbc.c~ 2015-12-12 21:04:51.000000000 +0100
++++ smbc-1.2.2/src/smbc.c 2015-12-12 21:07:31.503088019 +0100
+@@ -3616,8 +3616,8 @@ RreadRcfile()
+ if (access(Rfile, F_OK) != 0)
+ {
+ printf(Rm242, Rfile);
+- printf(Rm243);
+- printf(Rm244);
++ printf("%s", Rm243);
++ printf("%s", Rm244);
+ return;
+ }
+ Rfd = open(Rfile, O_RDONLY);
+@@ -5575,8 +5575,8 @@ RsigTerm()
+ endwin();
+ if (!Ri)
+ {
+- printf(Rm156);
+- printf(Rm157);
++ printf("%s", Rm156);
++ printf("%s", Rm157);
+ }
+ if ((RmainWinX < 80) || (RmainWinY < 25))
+ printf(Rm158, RmainWinX, RmainWinY);
+@@ -5589,7 +5589,7 @@ RsigTerm()
+ if (Rerror)
+ {
+ printf("**********************************************************\n");
+- printf(Rm159);
++ printf("%s", Rm159);
+ printf("**********************************************************\n");
+ }
+
+@@ -7024,7 +7024,7 @@ RDBG("smbc: main 100\n");
+ #ifdef HAVE_SET_CONTEXT
+ Rsmbc_set_context(Rstatcont);
+ #else /* not HAVE_SET_CONTEXT */
+- printf(Rm177);
++ printf("%s", Rm177);
+ #endif /* not HAVE_SET_CONTEXT */
+
+ RtryLockFileAndCreateIndexFile();
+--- smbc-1.2.2/src/smbc.c~ 2015-12-12 21:07:56.000000000 +0100
++++ smbc-1.2.2/src/smbc.c 2015-12-12 21:08:57.228616113 +0100
+@@ -6990,7 +6990,7 @@ main(int argc,char *argv[])
+ {
+ fprintf(stderr, Rm175, errno);
+ if (errno == 2)
+- fprintf(stderr, Rm176);
++ fprintf(stderr, "%s", Rm176);
+ exit(0);
+ }
+
+--- smbc-1.2.2/src/dulist.c~ 2015-12-12 21:07:56.000000000 +0100
++++ smbc-1.2.2/src/dulist.c 2015-12-12 21:09:21.612573730 +0100
+@@ -200,7 +200,7 @@ RShowAllItemsFromDUlist(int RnrDulist)
+ Rstraddtoend(&RstrT, "/");
+ Rstraddtoend(&RstrT, Rdls->filename);
+ Rstraddtoend(&RstrT, "\n");
+- printf(to_scr(RstrT));
++ printf("%s", to_scr(RstrT));
+ Rfree(RstrT);
+ RfreeOneTTdownloadAndGoToFirst(&Rdls);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/smbc.git/commitdiff/023a464db5ffadd9f932963b2f3bac53dccf2a1c
More information about the pld-cvs-commit
mailing list