remove using data style version

diff --git a/etersoft/Makefile b/etersoft/Makefile
deleted file mode 100644 (file)
index 281148b..0000000
--- a/etersoft/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#prefix = @prefix@
-bindir = $(prefix)/bin
-datadir = $(prefix)/share
-libdir = $(prefix)/lib
-
-INSTALL = ../tools/install-sh
-# initdir, sysconfdir
-
-# due various xargs options
-XARGS=`echo | xargs -IQQQ 2>/dev/null && echo "xargs -IQQQ" || echo "xargs -iQQQ"`
-
-install:
-       cd root ; find  ./ -type d | grep -v CVS | $(XARGS) mkdir -p "$(datadir)/wine/skel/QQQ"
-       cd root ; find  ./ -type f | grep -v Makefile | grep -v CVS | $(XARGS) ../$(INSTALL) -m 0644 "QQQ" "$(datadir)/wine/skel/QQQ"
-
-       # enable stack execution (for newest kernels > 2.6.12?) - need prelink package already installed
-       test -e /usr/bin/execstack && /usr/bin/execstack -s $(bindir)/wine-pthread || echo "WARNING: your have no %_bindir/execstack utility from prelink package"
-       # enable stack execution in wine binary (old kernel patches)
-       test -e /usr/bin/chstk && /usr/bin/chstk -e $(bindir)/wine-kthread $(bindir)/wine-pthread || true
-
-       cd ies4linux ; make prefix=$(prefix) libdir=$(libdir) datadir=$(datadir)
-       # user helper scripts
-
-       # will replace with our launcher
-       mv $(bindir)/wine $(bindir)/wine-glibc
-       $(INSTALL) -m 755 scripts/* $(bindir)/
-
-       $(INSTALL) -d -m 755 $(datadir)/wine
-       $(INSTALL) -m 644 desktop/menu.directory $(datadir)/wine/menu.directory
-       #
-       $(INSTALL) -d -m 755 $(initdir)/
-       $(INSTALL) -m 755 init/wine.init $(initdir)/wine
-       $(INSTALL) -m 755 init/wine.outformat $(initdir)/
-       #
-       $(INSTALL) -d -m 755 $(sysconfdir)/wine/
-       $(INSTALL) -m 644 reg/* $(sysconfdir)/wine/
-
-       # install all desktop files
-       $(INSTALL) -d -m 755 $(datadir)/applications/
-       $(INSTALL) -m 644 desktop/*.desktop $(datadir)/applications/
-
-       # install all icon files
-       $(INSTALL) -d -m 755 $(datadir)/icons
-       $(INSTALL) -m 644 icons/*.png $(datadir)/icons/
-
-       # Do not use standart wine launcher and wineprefixcreate
-       rm -f $(bindir)/winelauncher $(bindir)/wineprefixcreate
-       @rm -f $(datadir)/man/man1/wineprefixcreate.*
-       # we cannot recognize real man path here :(
-       @rm -f $(prefix)/man/man1/wineprefixcreate.*
-       rm -f $(bindir)/function_grep.pl
-       # at first run wine does like wineprefixcreate
-       ln -s wine $(bindir)/wineprefixcreate
-
-       # for shared dir
-       $(INSTALL) -d $(prefix)/../var/lib/wine/
-
-       # comment it out to fix bug #1536
-       # due bug with instmsia (needed for Win98)
-       #rm -f $(libdir)/wine/mscoree.dll.so
-
-       # Install font's helpers
-       #$(INSTALL) -m 755 ../tools/bin2res $(bindir)/bin2res
-       $(INSTALL) -m 755 ../tools/fnt2bdf $(bindir)/fnt2dbf
-       $(INSTALL) -m 755 ../tools/font_convert.sh $(bindir)/wine_font_convert.sh
-
-       #$(INSTALL) -d -m 755 $(prefix)/../etc/xdg/menus/applications-merged/
-       #$(INSTALL) -m 644 wine.menu $(prefix)/../etc/xdg/menus/applications-merged/wine.menu
-       $(INSTALL) -d -m 755 $(datadir)/desktop-directories/
-       $(INSTALL) -m 644 desktop/wine.directory $(datadir)/desktop-directories/wine.directory
-
-       cp -f ../dlls/twain_32/README ../README.TWAIN
-       cp -f ../tools/winedump/README ../README.winedump

diff --git a/etersoft/wine.spec b/etersoft/wine.spec
index 6593e0df814e795b32fc9f3200bbdf161f11f6e4..b3024e91217314e380b3627ced7b2dc67293dde7 100644 (file)
--- a/etersoft/wine.spec
+++ b/etersoft/wine.spec
@@ -15,10 +15,10 @@
 %define debug %nil
 #%define debug yes
 
-%define eterversion 1.0.9 
 Name: wine
-Version: 20080505
+Version: 1.0.9
 Release: alt1
+Epoch: 1
 
 Summary: Enviroment for running Windows applications (Etersoft edition)
 Summary(ru_RU.UTF-8): Среда для запуска программ Windows (сборка от Etersoft)
@@ -30,9 +30,7 @@ Url: http://winehq.org.ru/
 Packager: Vitaly Lipatov <lav@altlinux.ru>
 
 # Source tarball from git.etersoft.ru (with Etersoft's addons and patches)
-# TODO: subst VERSION
-Source: ftp://updates.etersoft.ru/pub/Etersoft/WINE@Etersoft/%eterversion/sources/tarball/%name-etersoft-public-%version.tar.bz2
-Source1: ftp://updates.etersoft.ru/pub/Etersoft/WINE@Etersoft/%eterversion/sources/tarball/%name-etersoft-common-%eterversion.tar.bz2
+Source: ftp://updates.etersoft.ru/pub/Etersoft/WINE@Etersoft/%version/sources/tarball/%name-etersoft-public-%version.tar.bz2
 
 AutoReq: yes, noperl
 
@@ -57,14 +55,14 @@ AutoReq: yes, noperl
 # General dependencies
 BuildRequires: rpm-build-compat >= 0.99
 BuildRequires: gcc util-linux flex bison
-BuildRequires: fontconfig-devel libfreetype-devel >= %freetype_ver 
-BuildRequires: libncurses-devel libncursesw-devel libtinfo-devel 
-BuildRequires: libssl-devel zlib-devel libldap-devel 
+BuildRequires: fontconfig-devel libfreetype-devel >= %freetype_ver
+BuildRequires: libncurses-devel libncursesw-devel libtinfo-devel
+BuildRequires: libssl-devel zlib-devel libldap-devel
 BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: libjpeg-devel liblcms-devel libpng-devel
 BuildRequires: libusb-devel libgphoto2-devel libsane-devel libcups-devel
-BuildRequires: libalsa-devel jackit-devel libieee1284-devel 
-BuildRequires: libGLU-devel 
+BuildRequires: libalsa-devel jackit-devel libieee1284-devel
+BuildRequires: libGLU-devel
 
 # Note: xorg-x11-devel requires all X11 devel packages, but missed on Fedora based systems
 # Require here all subpackages
@@ -72,7 +70,7 @@ BuildRequires: libGLU-devel
 # xorg-x11-util-macros xorg-x11-compat-devel libXfontcache-devel libFS-devel libXdmcp-devel
 # xorg-x11-xtrans-devel libdmx-devel libXp-devel libXtst-devel libXTrap-devel
 BuildRequires: xorg-x11-proto-devel libICE-devel libSM-devel
-BuildRequires: libX11-devel libXau-devel libXaw-devel libXrandr-devel 
+BuildRequires: libX11-devel libXau-devel libXaw-devel libXrandr-devel
 BuildRequires: libXext-devel libXfixes-devel libXfont-devel libXft-devel libXi-devel
 BuildRequires: libXmu-devel libXpm-devel libXrender-devel
 BuildRequires: libXres-devel libXScrnSaver-devel libXinerama-devel libXt-devel
@@ -185,7 +183,7 @@ linked with Wine.
 %package -n lib%name-gl
 Summary: DirectX/OpenGL support libraries for Wine
 Group: System/Libraries
-Requires: lib%name = %version
+Requires: lib%name = %version-%release
 
 %description -n lib%name-gl
 This package contains the libraries for DirectX/OpenGL support in Wine.
@@ -193,7 +191,7 @@ This package contains the libraries for DirectX/OpenGL support in Wine.
 %package -n lib%name-twain
 Summary: twain support library for wine
 Group: System/Libraries
-Requires: lib%name = %version
+Requires: lib%name = %version-%release
 
 %description -n lib%name-twain
 This package contains the library for twain support.
@@ -244,7 +242,6 @@ develop programs which make use of wine.
 
 %prep
 %setup -q -n wine-%version
-tar xfj %SOURCE1
 
 %build
 %configure --enable-dll --with-x \
@@ -267,8 +264,7 @@ export LD_LIBRARY_PATH=`pwd`/libs/wine
 ##########################################################################
 
 %install
-%makeinstall_std
-make -C etersoft install prefix=%buildroot%_prefix initdir=%buildroot%_initdir sysconfdir=%buildroot%_sysconfdir
+%makeinstall_std initdir=%_initdir
 
 # FIXME: hack about broken kthread detecting
 #%if %_vendor != "RPM"
@@ -468,6 +464,10 @@ rm -rf %buildroot%_mandir/*.UTF-8
 %exclude %_libdir/%name/libwinecrt0.a
 
 %changelog
+* Mon May 05 2008 Vitaly Lipatov <lav@altlinux.ru> 20080505-alt1
+- WINE@Etersoft 1.0.9 beta release (Wine 0.9.61 release)
+- new tarball build scheme
+
 * Fri Apr 04 2008 Vitaly Lipatov <lav@altlinux.ru> 20080404-alt1
 - WINE@Etersoft 1.0.9 beta release (Wine 0.9.59 release)
 - add parallel print jobs support