From 89855d12226a04e2464556399ba8a236911b18bd068c5a0afd833203284a8270 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 14 Jun 2010 14:33:34 +0000 Subject: [PATCH 1/8] - Added Ubuntu supplied desktop , menu and icons for Wine stuff. bnc#613850 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=46 --- ubuntuwine.tar.bz2 | 3 +++ wine.changes | 6 ++++++ wine.spec | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 ubuntuwine.tar.bz2 diff --git a/ubuntuwine.tar.bz2 b/ubuntuwine.tar.bz2 new file mode 100644 index 0000000..2b4c539 --- /dev/null +++ b/ubuntuwine.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1ddc082a1d70c43637dc831a5138788f2d9b9d5386201de15ea68d9368e3e1a +size 26182 diff --git a/wine.changes b/wine.changes index 185587a..dbae7aa 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 14 16:23:47 CEST 2010 - meissner@suse.de + +- Added Ubuntu supplied desktop , menu and icons for + Wine stuff. bnc#613850 + ------------------------------------------------------------------- Fri Jun 11 23:04:47 CEST 2010 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 14b8950..43e02f2 100644 --- a/wine.spec +++ b/wine.spec @@ -31,6 +31,7 @@ Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop +Source5: ubuntuwine.tar.bz2 Recommends: wine-gecko wine-mp3 Requires: wine-32bit = %version # for winetricks: @@ -107,12 +108,33 @@ make %{?jobs:-j%jobs} all make install DESTDIR=$RPM_BUILD_ROOT # install desktop file install -d $RPM_BUILD_ROOT/usr/share/applications/ +%suse_update_desktop_file %{SOURCE4} Emulator + install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/ mv $RPM_BUILD_ROOT/%{_mandir}/de.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/de mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr -%suse_update_desktop_file %{SOURCE4} Emulator +tar xjf %{SOURCE5} +# Copied from Ubuntu Wine out of debian.diff +# https://launchpad.net/~ubuntu-wine/+archive/ppa/+packages +# taken on 1.2rc2 time. +cd ubuntuwine + install -d $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + install -c -m 644 wine.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + + # Install application-specific desktop files + install -d $RPM_BUILD_ROOT/usr/share/applications + install -c -m 644 *.desktop $RPM_BUILD_ROOT/usr/share/applications/ + + install -d $RPM_BUILD_ROOT/usr/share/desktop-directories/ + install -c -m 644 *.directory $RPM_BUILD_ROOT/usr/share/desktop-directories/ + + # Install icons + install -d $RPM_BUILD_ROOT/usr/share/pixmaps + install -c -m 644 *.svg $RPM_BUILD_ROOT/usr/share/pixmaps +cd .. + %fdupes -s $RPM_BUILD_ROOT %clean @@ -160,6 +182,16 @@ rm -rf $RPM_BUILD_ROOT /usr/share/wine /usr/share/applications/wine.desktop %doc %{_mandir}/*/* +%dir /etc/xdg/ +%dir /etc/xdg/menus/ +%dir /etc/xdg/menus/applications-merged +/etc/xdg/menus/applications-merged/*.menu +%dir /usr/share/applications +/usr/share/applications/*.desktop +%dir /usr/share/desktop-directories/ +/usr/share/desktop-directories/*.directory +%dir /usr/share/pixmaps +/usr/share/pixmaps/*.svg %ifarch %ix86 From 74796e45a81b7f6edb585f0d22d805d64be994ec34404d9957fdb1ea12de5302 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 16 Jun 2010 19:47:13 +0000 Subject: [PATCH 2/8] make better OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=47 --- ubuntuwine.tar.bz2 | 4 ++-- wine.spec | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ubuntuwine.tar.bz2 b/ubuntuwine.tar.bz2 index 2b4c539..cd326ac 100644 --- a/ubuntuwine.tar.bz2 +++ b/ubuntuwine.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1ddc082a1d70c43637dc831a5138788f2d9b9d5386201de15ea68d9368e3e1a -size 26182 +oid sha256:088fdcfe3867111a42a4ba85d2bc29dac1b74f247c91ceeb38413dc0d0f911ac +size 26532 diff --git a/wine.spec b/wine.spec index 43e02f2..9e23d9e 100644 --- a/wine.spec +++ b/wine.spec @@ -182,15 +182,12 @@ rm -rf $RPM_BUILD_ROOT /usr/share/wine /usr/share/applications/wine.desktop %doc %{_mandir}/*/* -%dir /etc/xdg/ %dir /etc/xdg/menus/ %dir /etc/xdg/menus/applications-merged /etc/xdg/menus/applications-merged/*.menu -%dir /usr/share/applications /usr/share/applications/*.desktop %dir /usr/share/desktop-directories/ /usr/share/desktop-directories/*.directory -%dir /usr/share/pixmaps /usr/share/pixmaps/*.svg %ifarch %ix86 From a6a91ac8d027a4a282c4dcc52fa10a1091f858e02ceded8793a70a6c112082c9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 16 Jun 2010 21:40:49 +0000 Subject: [PATCH 3/8] more fixes to new menus OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=48 --- ubuntuwine.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntuwine.tar.bz2 b/ubuntuwine.tar.bz2 index cd326ac..ad4ac5c 100644 --- a/ubuntuwine.tar.bz2 +++ b/ubuntuwine.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:088fdcfe3867111a42a4ba85d2bc29dac1b74f247c91ceeb38413dc0d0f911ac -size 26532 +oid sha256:746c0b7aebefa5ef8552c417dbe77510a018d73615a1e987e1b9bcefd02f395d +size 26190 From 983cef2284fc5a6a02153de057d40fcb1cc60eecae05bab220be56ce01ed3fce Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 17 Jun 2010 14:01:57 +0000 Subject: [PATCH 4/8] mark /etc files as %config OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=49 --- wine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine.spec b/wine.spec index 9e23d9e..ff1b20f 100644 --- a/wine.spec +++ b/wine.spec @@ -184,7 +184,7 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/*/* %dir /etc/xdg/menus/ %dir /etc/xdg/menus/applications-merged -/etc/xdg/menus/applications-merged/*.menu +%config /etc/xdg/menus/applications-merged/*.menu /usr/share/applications/*.desktop %dir /usr/share/desktop-directories/ /usr/share/desktop-directories/*.directory From f8de1e3ab2558c8f5fc77e84dac55c8262c6f28bf03f552f0fc27bed2cc14809 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 18 Jun 2010 19:12:28 +0000 Subject: [PATCH 5/8] - updated to 1.2 rc4 - Many translation updates. - A lot of bug fixes. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=50 --- wine-1.1.46_1.2rc3.tar.bz2 | 3 --- wine-1.1.47_1.2rc4.tar.bz2 | 3 +++ wine.changes | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 wine-1.1.46_1.2rc3.tar.bz2 create mode 100644 wine-1.1.47_1.2rc4.tar.bz2 diff --git a/wine-1.1.46_1.2rc3.tar.bz2 b/wine-1.1.46_1.2rc3.tar.bz2 deleted file mode 100644 index 1ca35a8..0000000 --- a/wine-1.1.46_1.2rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0a8273f185d09e49f8845b9e57d356e724664ca149814bc9ed39ac209941011 -size 17594350 diff --git a/wine-1.1.47_1.2rc4.tar.bz2 b/wine-1.1.47_1.2rc4.tar.bz2 new file mode 100644 index 0000000..4cff7a9 --- /dev/null +++ b/wine-1.1.47_1.2rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6b322619710f0f4af693db7cdec222dcd08e6a27dc1857c6822dcf38d73ff88 +size 17617080 diff --git a/wine.changes b/wine.changes index dbae7aa..642b1c3 100644 --- a/wine.changes +++ b/wine.changes @@ -1,6 +1,9 @@ ------------------------------------------------------------------- -Mon Jun 14 16:23:47 CEST 2010 - meissner@suse.de +Fri Jun 18 21:11:50 CEST 2010 - meissner@suse.de +- updated to 1.2 rc4 + - Many translation updates. + - A lot of bug fixes. - Added Ubuntu supplied desktop , menu and icons for Wine stuff. bnc#613850 From ba11f8729d3d31f4d157e25c03c6cd0bd8fd58640af849b109b168dfd565da01 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 18 Jun 2010 20:25:38 +0000 Subject: [PATCH 6/8] fix ver OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=51 --- wine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine.spec b/wine.spec index ff1b20f..18aa45a 100644 --- a/wine.spec +++ b/wine.spec @@ -22,7 +22,7 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.46_1.2rc3 +Version: 1.1.47_1.2rc4 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com From 387656738e6b0bf90201c81bb19e2ef97e23c37d9f91c167d10562734d600cd6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 22 Jun 2010 08:41:04 +0000 Subject: [PATCH 7/8] Accepting request 41757 from Emulators checked in (request 41757) OBS-URL: https://build.opensuse.org/request/show/41757 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=52 --- ubuntuwine.tar.bz2 | 3 --- wine-1.1.46_1.2rc3.tar.bz2 | 3 +++ wine-1.1.47_1.2rc4.tar.bz2 | 3 --- wine.changes | 9 --------- wine.spec | 33 ++------------------------------- 5 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 ubuntuwine.tar.bz2 create mode 100644 wine-1.1.46_1.2rc3.tar.bz2 delete mode 100644 wine-1.1.47_1.2rc4.tar.bz2 diff --git a/ubuntuwine.tar.bz2 b/ubuntuwine.tar.bz2 deleted file mode 100644 index ad4ac5c..0000000 --- a/ubuntuwine.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:746c0b7aebefa5ef8552c417dbe77510a018d73615a1e987e1b9bcefd02f395d -size 26190 diff --git a/wine-1.1.46_1.2rc3.tar.bz2 b/wine-1.1.46_1.2rc3.tar.bz2 new file mode 100644 index 0000000..1ca35a8 --- /dev/null +++ b/wine-1.1.46_1.2rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0a8273f185d09e49f8845b9e57d356e724664ca149814bc9ed39ac209941011 +size 17594350 diff --git a/wine-1.1.47_1.2rc4.tar.bz2 b/wine-1.1.47_1.2rc4.tar.bz2 deleted file mode 100644 index 4cff7a9..0000000 --- a/wine-1.1.47_1.2rc4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6b322619710f0f4af693db7cdec222dcd08e6a27dc1857c6822dcf38d73ff88 -size 17617080 diff --git a/wine.changes b/wine.changes index 642b1c3..185587a 100644 --- a/wine.changes +++ b/wine.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 18 21:11:50 CEST 2010 - meissner@suse.de - -- updated to 1.2 rc4 - - Many translation updates. - - A lot of bug fixes. -- Added Ubuntu supplied desktop , menu and icons for - Wine stuff. bnc#613850 - ------------------------------------------------------------------- Fri Jun 11 23:04:47 CEST 2010 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 18aa45a..14b8950 100644 --- a/wine.spec +++ b/wine.spec @@ -22,7 +22,7 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.47_1.2rc4 +Version: 1.1.46_1.2rc3 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -31,7 +31,6 @@ Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop -Source5: ubuntuwine.tar.bz2 Recommends: wine-gecko wine-mp3 Requires: wine-32bit = %version # for winetricks: @@ -108,33 +107,12 @@ make %{?jobs:-j%jobs} all make install DESTDIR=$RPM_BUILD_ROOT # install desktop file install -d $RPM_BUILD_ROOT/usr/share/applications/ -%suse_update_desktop_file %{SOURCE4} Emulator - install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/ mv $RPM_BUILD_ROOT/%{_mandir}/de.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/de mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr -tar xjf %{SOURCE5} -# Copied from Ubuntu Wine out of debian.diff -# https://launchpad.net/~ubuntu-wine/+archive/ppa/+packages -# taken on 1.2rc2 time. -cd ubuntuwine - install -d $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged - install -c -m 644 wine.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged - - # Install application-specific desktop files - install -d $RPM_BUILD_ROOT/usr/share/applications - install -c -m 644 *.desktop $RPM_BUILD_ROOT/usr/share/applications/ - - install -d $RPM_BUILD_ROOT/usr/share/desktop-directories/ - install -c -m 644 *.directory $RPM_BUILD_ROOT/usr/share/desktop-directories/ - - # Install icons - install -d $RPM_BUILD_ROOT/usr/share/pixmaps - install -c -m 644 *.svg $RPM_BUILD_ROOT/usr/share/pixmaps -cd .. - +%suse_update_desktop_file %{SOURCE4} Emulator %fdupes -s $RPM_BUILD_ROOT %clean @@ -182,13 +160,6 @@ rm -rf $RPM_BUILD_ROOT /usr/share/wine /usr/share/applications/wine.desktop %doc %{_mandir}/*/* -%dir /etc/xdg/menus/ -%dir /etc/xdg/menus/applications-merged -%config /etc/xdg/menus/applications-merged/*.menu -/usr/share/applications/*.desktop -%dir /usr/share/desktop-directories/ -/usr/share/desktop-directories/*.directory -/usr/share/pixmaps/*.svg %ifarch %ix86 From e1878d778cbdfe3e752645fb8f039bed826ca24e080d9cf2511d7a8744f1bebc Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 22 Jun 2010 08:41:05 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/wine revision 77.0 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=892ebbfe9cdd84cc636d74209baeb97f --- ubuntuwine.tar.bz2 | 3 +++ wine-1.1.46_1.2rc3.tar.bz2 | 3 --- wine-1.1.47_1.2rc4.tar.bz2 | 3 +++ wine.changes | 9 +++++++++ wine.spec | 35 ++++++++++++++++++++++++++++++++--- 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 ubuntuwine.tar.bz2 delete mode 100644 wine-1.1.46_1.2rc3.tar.bz2 create mode 100644 wine-1.1.47_1.2rc4.tar.bz2 diff --git a/ubuntuwine.tar.bz2 b/ubuntuwine.tar.bz2 new file mode 100644 index 0000000..ad4ac5c --- /dev/null +++ b/ubuntuwine.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:746c0b7aebefa5ef8552c417dbe77510a018d73615a1e987e1b9bcefd02f395d +size 26190 diff --git a/wine-1.1.46_1.2rc3.tar.bz2 b/wine-1.1.46_1.2rc3.tar.bz2 deleted file mode 100644 index 1ca35a8..0000000 --- a/wine-1.1.46_1.2rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0a8273f185d09e49f8845b9e57d356e724664ca149814bc9ed39ac209941011 -size 17594350 diff --git a/wine-1.1.47_1.2rc4.tar.bz2 b/wine-1.1.47_1.2rc4.tar.bz2 new file mode 100644 index 0000000..4cff7a9 --- /dev/null +++ b/wine-1.1.47_1.2rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6b322619710f0f4af693db7cdec222dcd08e6a27dc1857c6822dcf38d73ff88 +size 17617080 diff --git a/wine.changes b/wine.changes index 185587a..642b1c3 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 18 21:11:50 CEST 2010 - meissner@suse.de + +- updated to 1.2 rc4 + - Many translation updates. + - A lot of bug fixes. +- Added Ubuntu supplied desktop , menu and icons for + Wine stuff. bnc#613850 + ------------------------------------------------------------------- Fri Jun 11 23:04:47 CEST 2010 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 14b8950..cfda3f8 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.1.46_1.2rc3) +# spec file for package wine (Version 1.1.47_1.2rc4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.46_1.2rc3 +Version: 1.1.47_1.2rc4 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -31,6 +31,7 @@ Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop +Source5: ubuntuwine.tar.bz2 Recommends: wine-gecko wine-mp3 Requires: wine-32bit = %version # for winetricks: @@ -107,12 +108,33 @@ make %{?jobs:-j%jobs} all make install DESTDIR=$RPM_BUILD_ROOT # install desktop file install -d $RPM_BUILD_ROOT/usr/share/applications/ +%suse_update_desktop_file %{SOURCE4} Emulator + install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/ mv $RPM_BUILD_ROOT/%{_mandir}/de.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/de mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr -%suse_update_desktop_file %{SOURCE4} Emulator +tar xjf %{SOURCE5} +# Copied from Ubuntu Wine out of debian.diff +# https://launchpad.net/~ubuntu-wine/+archive/ppa/+packages +# taken on 1.2rc2 time. +cd ubuntuwine + install -d $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + install -c -m 644 wine.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + + # Install application-specific desktop files + install -d $RPM_BUILD_ROOT/usr/share/applications + install -c -m 644 *.desktop $RPM_BUILD_ROOT/usr/share/applications/ + + install -d $RPM_BUILD_ROOT/usr/share/desktop-directories/ + install -c -m 644 *.directory $RPM_BUILD_ROOT/usr/share/desktop-directories/ + + # Install icons + install -d $RPM_BUILD_ROOT/usr/share/pixmaps + install -c -m 644 *.svg $RPM_BUILD_ROOT/usr/share/pixmaps +cd .. + %fdupes -s $RPM_BUILD_ROOT %clean @@ -160,6 +182,13 @@ rm -rf $RPM_BUILD_ROOT /usr/share/wine /usr/share/applications/wine.desktop %doc %{_mandir}/*/* +%dir /etc/xdg/menus/ +%dir /etc/xdg/menus/applications-merged +%config /etc/xdg/menus/applications-merged/*.menu +/usr/share/applications/*.desktop +%dir /usr/share/desktop-directories/ +/usr/share/desktop-directories/*.directory +/usr/share/pixmaps/*.svg %ifarch %ix86