+++ /dev/null
---- wine-1.3.9/server/Makefile.in~ 2010-12-10 20:33:07.000000000 +0100
-+++ wine-1.3.9/server/Makefile.in 2010-12-10 23:38:49.953335249 +0100
-@@ -54,8 +54,8 @@
- INSTALLDIRS = \
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(mandir)/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
-+ $(DESTDIR)$(mandir)/de/man$(prog_manext) \
-+ $(DESTDIR)$(mandir)/fr/man$(prog_manext)
-
- all: $(PROGRAMS)
-
-@@ -71,8 +71,8 @@
- $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver
-
- install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS)
-- $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
-- $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
-+ $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wineserver.$(prog_manext)
-+ $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext)
-
- uninstall::
- $(RM) $(DESTDIR)$(bindir)/wineserver
---- wine-1.3.9/tools/Makefile.in~ 2010-12-10 20:33:07.000000000 +0100
-+++ wine-1.3.9/tools/Makefile.in 2010-12-10 23:39:44.986668581 +0100
-@@ -32,8 +32,8 @@
- $(DESTDIR)$(datadir)/applications \
- $(DESTDIR)$(datadir)/wine \
- $(DESTDIR)$(mandir)/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
-+ $(DESTDIR)$(mandir)/de/man$(prog_manext) \
-+ $(DESTDIR)$(mandir)/fr/man$(prog_manext)
-
- UPDATE_DESKTOP_DATABASE = update-desktop-database
-
-@@ -75,8 +75,8 @@
- $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
-
- install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS)
-- $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
-- $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
-+ $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/winemaker.$(prog_manext)
-+ $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/winemaker.$(prog_manext)
-
- uninstall::
- $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \
---- wine-1.3.22/loader/Makefile.in.orig 2011-06-10 20:08:11.000000000 +0200
-+++ wine-1.3.22/loader/Makefile.in 2011-06-12 17:41:34.984957008 +0200
-@@ -24,9 +24,9 @@
- INSTALLDIRS = \
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(mandir)/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) \
-- $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)
-+ $(DESTDIR)$(mandir)/de/man$(prog_manext) \
-+ $(DESTDIR)$(mandir)/fr/man$(prog_manext) \
-+ $(DESTDIR)$(mandir)/pl/man$(prog_manext)
-
- all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES)
-
-@@ -53,9 +53,9 @@
- $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY)
-
- install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy
-- $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
-- $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
-- $(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext)
-+ $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext)
-+ $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext)
-+ $(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl/man$(prog_manext)/wine.$(prog_manext)
-
- uninstall::
- -cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES)
---- wine-0.9.28/configure.ac.orig 2006-12-22 17:17:47.000000000 +0100
-+++ wine-0.9.28/configure.ac 2006-12-24 03:10:15.504363300 +0100
-@@ -194,6 +194,7 @@
- machine/soundcard.h \
+diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/configure.ac wine-1.7.18/configure.ac
+--- wine-1.7.18.orig/configure.ac 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/configure.ac 2014-05-03 13:18:36.421083206 +0200
+@@ -443,6 +443,7 @@
+ machine/sysarch.h \
mntent.h \
ncurses.h \
+ ncurses/ncurses.h \
netdb.h \
netinet/in.h \
netinet/in_systm.h \
-@@ -519,7 +520,7 @@
+@@ -1354,9 +1355,12 @@
dnl **** Check which curses lib to use ***
- CURSESLIBS=""
+ CURSES_LIBS=""
-if test "$ac_cv_header_ncurses_h" = "yes"
+if test "$ac_cv_header_ncurses_h" = "yes" || test "$ac_cv_header_ncurses_ncurses_h" = "yes"
then
- AC_CHECK_LIB(ncurses,waddch,[CURSESLIBS="-lncurses"])
+ WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"])
++ if test "x$ac_cv_lib_soname_ncurses" = "x"; then
++ WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"])
++ fi
elif test "$ac_cv_header_curses_h" = "yes"
---- wine-0.9.41/programs/wineconsole/curses.c.old 2007-07-14 22:00:49.124363079 +0200
-+++ wine-0.9.41/programs/wineconsole/curses.c 2007-07-14 22:07:46.714791368 +0200
-@@ -39,6 +39,8 @@
+ then
+ WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
+@@ -1365,8 +1369,8 @@
+ LIBS="$LIBS $CURSES_LIBS"
+ AC_CHECK_FUNCS(mousemask)
+ LIBS="$ac_save_LIBS"
+-WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
+- [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
++WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"],
++ [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.])
+
+ dnl **** Check for SANE ****
+ if test "x$with_sane" != "xno"
+diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/dlls/kernel32/term.c wine-1.7.18/dlls/kernel32/term.c
+--- wine-1.7.18.orig/dlls/kernel32/term.c 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/dlls/kernel32/term.c 2014-05-03 13:16:18.597752974 +0200
+@@ -27,6 +27,8 @@
# include <ncurses.h>
#elif defined(HAVE_CURSES_H)
# include <curses.h>
#endif
/* avoid redefinition warnings */
#undef KEY_EVENT
-@@ -62,7 +64,7 @@
+@@ -34,6 +36,8 @@
+
+ #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
+ #include <term.h>
++#elif defined(HAVE_NCURSES_NCURSES_H)
++#include <ncurses/term.h>
+ #endif
+
+ #include <windef.h>
+@@ -148,7 +152,7 @@
#if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
-#ifdef HAVE_NCURSES_H
-+#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
++#ifdef HAVE_NCURSES_H || defined(HAVE_NCURSES_NCURSES_H)
# define CURSES_NAME "ncurses"
#else
# define CURSES_NAME "curses"
---- wine-1.3.13/dlls/kernel32/term.c~ 2011-02-04 20:06:51.000000000 +0100
-+++ wine-1.3.13/dlls/kernel32/term.c 2011-02-05 16:25:43.627060372 +0100
-@@ -27,6 +27,8 @@
+diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/programs/wineconsole/curses.c wine-1.7.18/programs/wineconsole/curses.c
+--- wine-1.7.18.orig/programs/wineconsole/curses.c 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/programs/wineconsole/curses.c 2014-05-03 13:16:18.597752974 +0200
+@@ -40,6 +40,8 @@
# include <ncurses.h>
#elif defined(HAVE_CURSES_H)
# include <curses.h>
#endif
/* avoid redefinition warnings */
#undef KEY_EVENT
-@@ -34,6 +36,8 @@
-
- #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
- #include <term.h>
-+#elif defined(HAVE_NCURSES_NCURSES_H)
-+#include <ncurses/term.h>
- #endif
-
- #include <windef.h>
-@@ -148,7 +152,7 @@
+@@ -64,7 +66,7 @@
#if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
-#ifdef HAVE_NCURSES_H
-+#ifdef HAVE_NCURSES_H || defined(HAVE_NCURSES_NCURSES_H)
++#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
# define CURSES_NAME "ncurses"
#else
# define CURSES_NAME "curses"
-diff -urN wine-1.4.1.org/configure.ac wine-1.4.1/configure.ac
---- wine-1.4.1.org/configure.ac 2012-06-15 21:17:00.000000000 +0200
-+++ wine-1.4.1/configure.ac 2013-06-13 17:34:25.210134842 +0200
-@@ -1281,6 +1281,9 @@
- if test "$ac_cv_header_ncurses_h" = "yes"
- then
- WINE_CHECK_SONAME(ncurses,waddch,[CURSESLIBS="-lncurses"])
-+ if test "x$ac_cv_lib_soname_ncurses" = "x"; then
-+ WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"])
-+ fi
- elif test "$ac_cv_header_curses_h" = "yes"
- then
- WINE_CHECK_SONAME(curses,waddch,[CURSESLIBS="-lcurses"])
-@@ -1289,8 +1292,8 @@
- LIBS="$LIBS $CURSESLIBS"
- AC_CHECK_FUNCS(mousemask)
- LIBS="$ac_save_LIBS"
--WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
-- [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
-+WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"],
-+ [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.])
-
- dnl **** Check for SANE ****
- if test "x$with_sane" != "xno"
-diff -durN wine-1.6.2.orig/loader/wine.de.man.in wine-1.6.2/loader/wine.de.man.in
---- wine-1.6.2.orig/loader/wine.de.man.in 2014-01-10 21:37:29.000000000 +0100
-+++ wine-1.6.2/loader/wine.de.man.in 2014-05-03 12:07:16.337846160 +0200
+diff -dur wine-1.7.18.orig/loader/wine.de.UTF-8.man.in wine-1.7.18/loader/wine.de.UTF-8.man.in
+--- wine-1.7.18.orig/loader/wine.de.UTF-8.man.in 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/loader/wine.de.UTF-8.man.in 2014-05-03 13:26:11.771072964 +0200
@@ -1,14 +1,14 @@
.\" -*- nroff -*-
-.TH WINE 1 "November 2007" "@PACKAGE_STRING@" "Windows On Unix"
.PP
Für das Übergeben von Kommandos an Windows-Programme siehe den
Abschnitt
-diff -durN wine-1.6.2.orig/loader/wine.fr.man.in wine-1.6.2/loader/wine.fr.man.in
---- wine-1.6.2.orig/loader/wine.fr.man.in 2014-01-10 21:37:29.000000000 +0100
-+++ wine-1.6.2/loader/wine.fr.man.in 2014-05-03 12:07:54.424511977 +0200
+diff -dur wine-1.7.18.orig/loader/wine.fr.UTF-8.man.in wine-1.7.18/loader/wine.fr.UTF-8.man.in
+--- wine-1.7.18.orig/loader/wine.fr.UTF-8.man.in 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/loader/wine.fr.UTF-8.man.in 2014-05-03 13:26:36.374405744 +0200
@@ -1,13 +1,13 @@
-.TH WINE 1 "juillet 2013" "@PACKAGE_STRING@" "Windows sur Unix"
+.TH WINE64 1 "juillet 2013" "@PACKAGE_STRING@" "Windows sur Unix"
.PP
Pour des instructions sur le passage d'arguments aux programmes Windows, veuillez lire la section
.B
-diff -durN wine-1.6.2.orig/loader/wine.man.in wine-1.6.2/loader/wine.man.in
---- wine-1.6.2.orig/loader/wine.man.in 2014-01-10 21:37:29.000000000 +0100
-+++ wine-1.6.2/loader/wine.man.in 2014-05-03 12:08:34.081177747 +0200
+diff -dur wine-1.7.18.orig/loader/wine.man.in wine-1.7.18/loader/wine.man.in
+--- wine-1.7.18.orig/loader/wine.man.in 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/loader/wine.man.in 2014-05-03 13:26:59.134405233 +0200
@@ -1,13 +1,13 @@
-.TH WINE 1 "July 2013" "@PACKAGE_STRING@" "Windows On Unix"
+.TH WINE64 1 "July 2013" "@PACKAGE_STRING@" "Windows On Unix"
.PP
For instructions on passing arguments to Windows programs, please see the
.B
-diff -durN wine-1.6.2.orig/loader/wine.pl.man.in wine-1.6.2/loader/wine.pl.man.in
---- wine-1.6.2.orig/loader/wine.pl.man.in 2014-01-10 21:37:29.000000000 +0100
-+++ wine-1.6.2/loader/wine.pl.man.in 2014-05-03 12:07:16.337846160 +0200
+diff -dur wine-1.7.18.orig/loader/wine.pl.UTF-8.man.in wine-1.7.18/loader/wine.pl.UTF-8.man.in
+--- wine-1.7.18.orig/loader/wine.pl.UTF-8.man.in 2014-05-02 20:15:48.000000000 +0200
++++ wine-1.7.18/loader/wine.pl.UTF-8.man.in 2014-05-03 13:27:13.701071570 +0200
@@ -1,14 +1,14 @@
.\" -*- nroff -*-
-.TH WINE 1 "October 2005" "@PACKAGE_STRING@" "Windows On Unix"
Patch2: %{name}-ncurses.patch
Patch4: %{name}-disable-valgrind.patch
Patch5: %{name}-ca_certificates.patch
-Patch6: %{name}-manpaths.patch
-Patch7: desktop.patch
-Patch8: %{name}-wine64_man.patch
+Patch6: desktop.patch
+Patch7: %{name}-wine64_man.patch
URL: http://www.winehq.org/
BuildRequires: OpenAL-devel >= 1.1
BuildRequires: ocl-icd-libOpenCL-devel
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%ifarch %{x8664}
-%patch8 -p1
+%patch7 -p1
%endif
%build
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-findup -m $RPM_BUILD_ROOT%{_winedir}/fakedlls
-
-install -p tools/fnt2fon $RPM_BUILD_ROOT%{_bindir}
+install -p tools/sfnt2fon/sfnt2fon $RPM_BUILD_ROOT%{_bindir}
cp -a aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
install -d \
mv -f files.so. files.so
done
+for dir in $RPM_BUILD_ROOT%{_mandir}/*.UTF-8 ; do
+ mv "$dir" "${dir%.UTF-8}"
+done
+
%ifarch %{x8664}
for langdir in "" de/ fr/ pl/ ; do
mv $RPM_BUILD_ROOT%{_mandir}/${langdir}man1/{wine,wine64}.1
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fnt2fon
+%attr(755,root,root) %{_bindir}/sfnt2fon
%attr(755,root,root) %{_bindir}/function_grep.pl
%attr(755,root,root) %{_bindir}/widl
%attr(755,root,root) %{_bindir}/winebuild