new build with spec fix

diff --git a/VERSION b/VERSION
index e692be562d5f0623aa566f3c8d330068c5ef7634..bc57d228ae965aba79747ed31a4c8ef075fde98a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-WINE@Etersoft version 1.3.13-eter1.6
+WINE@Etersoft version 1.3.13-eter2

diff --git a/configure b/configure
index 8252d18bea92ac2562ad0145efffc5cfaec8d980..86b3d661edb71b202b8ebb18ef869b5bcfc132b8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for WINE@Etersoft 1.3.13-eter1.6.
+# Generated by GNU Autoconf 2.65 for WINE@Etersoft 1.3.13-eter2.
 #
 # Report bugs to <wine@etersoft.ru>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='WINE@Etersoft'
 PACKAGE_TARNAME='wine'
-PACKAGE_VERSION='1.3.13-eter1.6'
-PACKAGE_STRING='WINE@Etersoft 1.3.13-eter1.6'
+PACKAGE_VERSION='1.3.13-eter2'
+PACKAGE_STRING='WINE@Etersoft 1.3.13-eter2'
 PACKAGE_BUGREPORT='wine@etersoft.ru'
 PACKAGE_URL='http://www.etersoft.ru'
 
@@ -1379,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures WINE@Etersoft 1.3.13-eter1.6 to adapt to many kinds of systems.
+\`configure' configures WINE@Etersoft 1.3.13-eter2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1448,7 +1448,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of WINE@Etersoft 1.3.13-eter1.6:";;
+     short | recursive ) echo "Configuration of WINE@Etersoft 1.3.13-eter2:";;
    esac
   cat <<\_ACEOF
 
@@ -1596,7 +1596,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-WINE@Etersoft configure 1.3.13-eter1.6
+WINE@Etersoft configure 1.3.13-eter2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2145,7 +2145,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by WINE@Etersoft $as_me 1.3.13-eter1.6, which was
+It was created by WINE@Etersoft $as_me 1.3.13-eter2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -16426,7 +16426,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by WINE@Etersoft $as_me 1.3.13-eter1.6, which was
+This file was extended by WINE@Etersoft $as_me 1.3.13-eter2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16497,7 +16497,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-WINE@Etersoft config.status 1.3.13-eter1.6
+WINE@Etersoft config.status 1.3.13-eter2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

diff --git a/etersoft/wine-etersoft.spec b/etersoft/wine-etersoft.spec
index 4e756d3917b6be3947ea2c1468fb9500a5527904..7eb3a9278fedf2096b8f98c081bf9db0bfe3d7d0 100644 (file)
--- a/etersoft/wine-etersoft.spec
+++ b/etersoft/wine-etersoft.spec
@@ -14,7 +14,7 @@
 
 Name: wine-etersoft
 Version: 1.3.13
-Release: alt1.6
+Release: alt2
 
 Summary: WINE@Etersoft - Environment for running Windows applications (main part)
 Summary(ru_RU.UTF-8): WINE@Etersoft - Среда для запуска программ Windows (основная часть)
@@ -49,17 +49,17 @@ AutoReq: yes, noperl
 %define freetype_ver 2.1.9
 
 # General dependencies
-BuildRequires: rpm-build-intro >= 0.99
+BuildRequires: rpm-build-intro
 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: libssl-devel zlib-devel libldap-devel libgnutls-devel
 BuildRequires: libxslt-devel libxml2-devel
-BuildRequires: libjpeg-devel liblcms-devel libpng-devel libtiff-devel 
+BuildRequires: libjpeg-devel liblcms-devel libpng-devel libtiff-devel
 BuildRequires: libusb-devel libgphoto2-devel libsane-devel libcups-devel
 BuildRequires: libalsa-devel jackit-devel libieee1284-devel libhal-devel
 BuildRequires: libopenal-devel libGLU-devel
-BuildRequires: libv4l-devel gstreamer-devel libgsm-devel libmpg123-devel
+BuildRequires: libv4l-devel gstreamer-devel gst-plugins-devel libgsm-devel libmpg123-devel
 
 # https://bugzilla.altlinux.org/show_bug.cgi?id=20356
 BuildRequires: libesd-devel
@@ -70,7 +70,7 @@ BuildRequires: libesd-devel
 # Skipped: libxorgconfig-devel libxkbfile-devel libxkbui-devel xcursorgen xorg-x11-font-utils
 # 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: libICE-devel libSM-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
@@ -314,18 +314,15 @@ strip %buildroot/%_libdir/wine/*.so*
 %_datadir/desktop-directories/wine.directory
 %_iconsdir/*
 %dir %_datadir/wine/
+%_datadir/wine/logo.bmp
+%_datadir/wine/companylogo.bmp
 %_datadir/wine/ies4linux/
 %_datadir/wine/skel/
 %_datadir/wine/menu.directory
 %_datadir/wine/winesplash.xpm
-%_datadir/wine/logo.bmp
-%_datadir/wine/companylogo.bmp
-%_datadir/wine/l_intl.nls
-
-%_man1dir/wine.*
-%_man1dir/msiexec.*
-%_man1dir/notepad.*
-%_man1dir/reg*
+%_man1dir/wine.1*
+%_man1dir/wineserver.1*
+%_man1dir/winedbg.1.*
 
 # lib part
 %_libdir/libwine*.so.*
@@ -346,6 +343,7 @@ strip %buildroot/%_libdir/wine/*.so*
 %_libdir/wine/*.sys.so
 %_datadir/wine/generic.ppd
 %_datadir/wine/wine.inf
+%_datadir/wine/l_intl.nls
 %_datadir/wine/fonts/
 
 # move to separate packages
@@ -396,19 +394,34 @@ strip %buildroot/%_libdir/wine/*.so*
 %_libdir/wine/libdxerr9.a
 %_libdir/wine/libdxguid.a
 %_libdir/wine/libstrmiids.a
-%_libdir/wine/libuuid.a
 %_libdir/wine/libstrmbase.a
+%_libdir/wine/libuuid.a
+
+%_man1dir/wmc.1*
+%_man1dir/wrc.1*
+%_man1dir/widl.1*
+%_man1dir/winebuild*
+%_man1dir/winedump.1.*
+%_man1dir/wineg++.1.*
+%_man1dir/winegcc.1.*
+%_man1dir/winecpp.1.*
+%_man1dir/winemaker.1.*
+%_man1dir/msiexec.1.*
+%_man1dir/notepad.1.*
+%_man1dir/regedit.1.*
+%_man1dir/regsvr32.1.*
+%_man1dir/wineboot.1.*
+%_man1dir/winecfg.1.*
+%_man1dir/wineconsole.1.*
+%_man1dir/winefile.1.*
+%_man1dir/winemine.1.*
+%_man1dir/winepath.1.*
 
-%_man1dir/wmc.*
-%_man1dir/wrc.*
-%_man1dir/widl.*
-%_man1dir/winebuild.*
-%_man1dir/winedump.*
-%_man1dir/wineg++.*
-%_man1dir/winegcc.*
-%_man1dir/winemaker.*
 
 %changelog
+* Thu Apr 28 2011 Vitaly Lipatov <lav@altlinux.ru> 1.3.13-alt2
+- fix spec
+
 * Tue Apr 26 2011 Etersoft Builder <builder@etersoft.ru> 1.3.13-alt1.6
 - add int 0x2e support (eterbug #6247)
 - include: Add IOCTL_USB_GET_ROOT_HUB_NAME declaration (eterbug #6247)