rpms/wine/EL-5 wine-mime-msi.desktop, NONE, 1.1 wine-wineboot.desktop, NONE, 1.1 wine-wineshelllink.patch, NONE, 1.1 wineshelllink-fedora, NONE, 1.1 .cvsignore, 1.33, 1.34 sources, 1.34, 1.35 wine-rpath.patch, 1.3, 1.4 wine.spec, 1.47, 1.48
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Sun Jun 3 14:52:24 UTC 2007
- Previous message: rpms/blobAndConquer/FC-6 .cvsignore, 1.2, 1.3 blobAndConquer-0.90-exit-crash.patch, 1.1, 1.2 blobAndConquer.spec, 1.1, 1.2 sources, 1.2, 1.3 blobAndConquer-0.90-no-stencil.patch, 1.1, NONE blobAndConquer-0.90-opt-fix.patch, 1.1, NONE blobAndConquer-0.90-strict-alias.patch, 1.1, NONE blobAndConquer-0.90-unix-lf.patch, 1.1, NONE
- Next message: rpms/wine/F-7 wine-mime-msi.desktop, NONE, 1.1 wine-wineboot.desktop, NONE, 1.1 wine-wineshelllink.patch, NONE, 1.1 wineshelllink-fedora, NONE, 1.1 .cvsignore, 1.33, 1.34 sources, 1.34, 1.35 wine-rpath.patch, 1.3, 1.4 wine.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14163/EL-5
Modified Files:
.cvsignore sources wine-rpath.patch wine.spec
Added Files:
wine-mime-msi.desktop wine-wineboot.desktop
wine-wineshelllink.patch wineshelllink-fedora
Log Message:
- version upgrade (#242087)
- fix menu problem (#220723)
- fix BR
- clean up desktop file section
- version upgrade
- add BR for xcursor (#240648)
- add desktop entry for wineboot (#240683)
- add mime handler for msi files (#240682)
- minor cleanups
--- NEW FILE wine-mime-msi.desktop ---
[Desktop Entry]
Type=Application
Name=Windows Installer File
Encoding=UTF-8
Exec=wine %f
MimeType=application/x-ole-storage;text/mspg-legacyinfo
--- NEW FILE wine-wineboot.desktop ---
[Desktop Entry]
Name=wineboot
Comment=Simulate restart
Exec=wineboot
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;Wine;
wine-wineshelllink.patch:
--- NEW FILE wine-wineshelllink.patch ---
--- tools/wineshelllink.orig 2007-06-03 12:56:07.000000000 +0200
+++ tools/wineshelllink 2007-06-03 12:57:27.000000000 +0200
@@ -231,4 +231,6 @@
desktop_entry > "$desktop_target"
fi
+exec /usr/bin/wineshelllink-fedora
+
exit 0
--- NEW FILE wineshelllink-fedora ---
#!/bin/sh
for i in $HOME/.config/menus/applications-merged/*menu ; do
sed -i -e 's:<Name>wine-wine</Name>:<Name>Wine</Name>:g' \
-e ':<Directory>wine-wine</Directory>:<Directory>wine</Directory>:g' "$i"
done
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 27 Apr 2007 23:01:32 -0000 1.33
+++ .cvsignore 3 Jun 2007 14:51:47 -0000 1.34
@@ -1 +1 @@
-wine-0.9.36-fe.tar.bz2
+wine-0.9.38-fe.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 27 Apr 2007 23:01:32 -0000 1.34
+++ sources 3 Jun 2007 14:51:47 -0000 1.35
@@ -1 +1 @@
-985fb75705f308563d326de55915c726 wine-0.9.36-fe.tar.bz2
+3ad80c4edafd4d462568849889c032b9 wine-0.9.38-fe.tar.bz2
wine-rpath.patch:
Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/wine-rpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine-rpath.patch 17 Sep 2006 14:15:07 -0000 1.3
+++ wine-rpath.patch 3 Jun 2007 14:51:47 -0000 1.4
@@ -1,6 +1,6 @@
---- configure.orig 2006-09-17 14:55:39.000000000 +0200
-+++ configure 2006-09-17 14:57:19.000000000 +0200
-@@ -15903,14 +15903,14 @@
+--- configure.orig 2007-05-23 10:59:34.000000000 +0200
++++ configure 2007-05-23 11:02:05.000000000 +0200
+@@ -13596,14 +13596,14 @@
fi
@@ -9,7 +9,7 @@
-echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... $ECHO_C" >&6; }
+ as_ac_var=`echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
-+echo $ECHO_N "checking whether the compiler supports -fPIC$ECHO_C" >&6; }
++echo $ECHO_N "checking whether the compiler supports -fPIC $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19,23 +19,25 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15976,7 +15976,7 @@
+@@ -13653,7 +13653,7 @@
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
- LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+ LIBWINE_LDFLAGS=""
- fi
-
-
---- configure.ac.orig 2006-09-17 14:57:25.000000000 +0200
-+++ configure.ac 2006-09-17 14:58:03.000000000 +0200
-@@ -1058,9 +1058,6 @@
+ else
+ as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+--- configure.ac.orig 2007-05-23 10:59:39.000000000 +0200
++++ configure.ac 2007-05-23 11:02:39.000000000 +0200
+@@ -1031,11 +1031,6 @@
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
- WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-- [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
+- [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"],
+- [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
+- [LIBWINE_LDFLAGS="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])])
-
case $host_cpu in
*i[[3456789]]86* | x86_64)
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/wine.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- wine.spec 5 May 2007 07:50:16 -0000 1.47
+++ wine.spec 3 Jun 2007 14:51:47 -0000 1.48
@@ -1,8 +1,8 @@
%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
Name: wine
-Version: 0.9.36
-Release: 2%{?dist}
+Version: 0.9.38
+Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
Group: Applications/Emulators
@@ -20,7 +20,7 @@
# Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
# programs/winecfg/libraries.c: "winemp3.acm",
-Source0: wine-0.9.36-fe.tar.bz2
+Source0: wine-0.9.38-fe.tar.bz2
Source1: wine.init
Source3: wine-README-Fedora
Source4: wine-32.conf
@@ -32,9 +32,19 @@
Source104: wine-winefile.desktop
Source105: wine-winemine.desktop
Source106: wine-winhelp.desktop
+Source107: wine-wineboot.desktop
+
# desktop dir
Source200: wine.menu
Source201: wine.directory
+
+# mime types
+Source300: wine-mime-msi.desktop
+
+#enhancements
+Source400: wineshelllink-fedora
+Patch400: wine-wineshelllink.patch
+
Patch0: wine-prefixfonts.patch
Patch1: wine-rpath.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +85,7 @@
BuildRequires: cups-devel
BuildRequires: libXmu-devel
BuildRequires: libXi-devel
+BuildRequires: libXcursor-devel
# dbus/hal >= FC5
BuildRequires: dbus-devel hal-devel
@@ -105,9 +116,10 @@
Group: Applications/Emulators
Requires: %{_bindir}/xmessage
Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
-Requires(post): /usr/bin/update-desktop-database
+Requires(post): desktop-file-utils >= 0.8
Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
+Requires(postun): /sbin/ldconfig
+Requires(postun): desktop-file-utils >= 0.8
Obsoletes: wine <= 0.9.15-1%{?dist}
Obsoletes: wine-arts < 0.9.34
@@ -191,6 +203,7 @@
%setup -q -n %{name}-%{version}-fe
%patch0
%patch1
+%patch400
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -230,57 +243,63 @@
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE100}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE101}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE102}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE103}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE104}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE105}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
%{SOURCE106}
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
+ %{SOURCE107}
+
+desktop-file-install \
+ --vendor=fedora \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
+#mime-types
+desktop-file-install \
+ --vendor=fedora \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ %{SOURCE300}
+
+
cp %{SOURCE3} README-Fedora
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m755 %{SOURCE400} $RPM_BUILD_ROOT%{_bindir}/wineshelllink-fedora
+
%clean
rm -rf %{buildroot}
@@ -343,11 +362,14 @@
%{_bindir}/wineprefixcreate
%{_mandir}/man1/wineprefixcreate.1*
%{_bindir}/wineshelllink
+%{_bindir}/wineshelllink-fedora
%{_bindir}/winecfg
%{_bindir}/uninstaller
%{_initrddir}/wine
%{_libdir}/wine/expand.exe.so
%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/net.exe.so
+%{_libdir}/wine/ntoskrnl.exe.so
%{_libdir}/wine/oleview.exe.so
%{_libdir}/wine/regedit.exe.so
%{_libdir}/wine/regsvr32.exe.so
@@ -360,12 +382,15 @@
%{_libdir}/wine/winemenubuilder.exe.so
%{_libdir}/wine/winevdm.exe.so
%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedevice.exe.so
%{_libdir}/wine/uninstaller.exe.so
%dir %{_datadir}/wine
+%{_datadir}/applications/fedora-wine-mime-msi.desktop
%{_datadir}/applications/fedora-wine.desktop
%{_datadir}/applications/fedora-wine-regedit.desktop
%{_datadir}/applications/fedora-wine-uninstaller.desktop
%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_datadir}/applications/fedora-wine-wineboot.desktop
%{_datadir}/desktop-directories/wine.directory
%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
%{_mandir}/man1/wine.1.gz
@@ -442,7 +467,9 @@
%{_libdir}/wine/eject.exe.so
%{_libdir}/wine/gdi.exe16
%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/gdiplus.dll.so
%{_libdir}/wine/gphoto2.ds.so
+%{_libdir}/wine/hal.dll.so
%{_libdir}/wine/hid.dll.so
%{_libdir}/wine/hh.exe.so
%{_libdir}/wine/hlink.dll.so
@@ -604,6 +631,7 @@
%{_libdir}/wine/winsock.dll16
%{_libdir}/wine/winspool.drv.so
%{_libdir}/wine/spoolss.dll.so
+%{_libdir}/wine/winscard.dll.so
%{_libdir}/wine/wintab.dll16
%{_libdir}/wine/wintab32.dll.so
%{_libdir}/wine/wintrust.dll.so
@@ -718,6 +746,21 @@
%{_libdir}/wine/*.def
%changelog
+* Sat Jun 02 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.38-1
+- version upgrade (#242087)
+- fix menu problem (#220723)
+- fix BR
+- clean up desktop file section
+
+* Wed May 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.37-1
+- version upgrade
+- add BR for xcursor (#240648)
+- add desktop entry for wineboot (#240683)
+- add mime handler for msi files (#240682)
+- minor cleanups
+
* Wed May 02 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.36-2
- fix BR (#238774)
- Previous message: rpms/blobAndConquer/FC-6 .cvsignore, 1.2, 1.3 blobAndConquer-0.90-exit-crash.patch, 1.1, 1.2 blobAndConquer.spec, 1.1, 1.2 sources, 1.2, 1.3 blobAndConquer-0.90-no-stencil.patch, 1.1, NONE blobAndConquer-0.90-opt-fix.patch, 1.1, NONE blobAndConquer-0.90-strict-alias.patch, 1.1, NONE blobAndConquer-0.90-unix-lf.patch, 1.1, NONE
- Next message: rpms/wine/F-7 wine-mime-msi.desktop, NONE, 1.1 wine-wineboot.desktop, NONE, 1.1 wine-wineshelllink.patch, NONE, 1.1 wineshelllink-fedora, NONE, 1.1 .cvsignore, 1.33, 1.34 sources, 1.34, 1.35 wine-rpath.patch, 1.3, 1.4 wine.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list