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