[Ehs-devel] SF.net SVN: ehs:[172] trunk

[<fe...@us...>]

Revision: 172
          http://sourceforge.net/p/ehs/code/172
Author:   felfert
Date:     2018-09-20 08:29:49 +0000 (Thu, 20 Sep 2018)
Log Message:
-----------
Updated svn:ignore

Modified Paths:
--------------
    trunk/conf/mingw-ehs.spec.in

Property Changed:
----------------
    trunk/
    trunk/conf/
    trunk/doc/

Index: trunk
===================================================================
--- trunk	2018-09-19 11:51:58 UTC (rev 171)
+++ trunk	2018-09-20 08:29:49 UTC (rev 172)

Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -9,8 +9,11 ##
 ehstypes.h
 .deps
 *.tar.gz
+*.xz
+*.dsc
 .libs
 libtool
+ChangeLog
 Makefile
 Makefile.in
 stamp-h1
Index: trunk/conf
===================================================================
--- trunk/conf	2018-09-19 11:51:58 UTC (rev 171)
+++ trunk/conf	2018-09-20 08:29:49 UTC (rev 172)

Property changes on: trunk/conf
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1,4 ##
-*.spec
+compile
 config.guess
 config.sub
 depcomp
## -6,3 +6,5 ##
 install-sh
 ltmain.sh
 missing
+*.pc
+*.spec
Modified: trunk/conf/mingw-ehs.spec.in
===================================================================
--- trunk/conf/mingw-ehs.spec.in	2018-09-19 11:51:58 UTC (rev 171)
+++ trunk/conf/mingw-ehs.spec.in	2018-09-20 08:29:49 UTC (rev 172)
@@ -22,16 +22,18 @@
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gcc-c++
-BuildRequires:  mingw32-openssl
 BuildRequires:  mingw32-pthreads
+BuildRequires:  mingw32-openssl-static
 BuildRequires:  mingw32-boost-static
+BuildRequires:  mingw32-zlib-static
 
 BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw64-gcc-c++
 BuildRequires:  mingw64-binutils
-BuildRequires:  mingw64-openssl
 BuildRequires:  mingw64-pthreads
+BuildRequires:  mingw64-openssl-static
 BuildRequires:  mingw64-boost-static
+BuildRequires:  mingw64-zlib-static
 
 %if 0%{?enable_setup}
 BuildRequires:  iscc
@@ -105,7 +107,7 @@
 %setup -q -n %{basepkg}-%{version}
 
 %build
-%{mingw_configure} --enable-static --enable-shared --enable-warn
+%{mingw_configure} --enable-static --disable-shared --enable-warn
 %{mingw_make} %{?smp_mflags} %{make_verbose_flags}
 
 %install
@@ -114,8 +116,6 @@
 MINGW64_MAKE_ARGS=transform=s/x86_64-w64-mingw32-//
 %{mingw_make} DESTDIR=%{buildroot} %{make_verbose_flags} install
 # Libtool files don't need to be bundled
-find %{buildroot} -name "*.la" -delete
-
 %clean
 %{__rm} -rf %{buildroot}
 

Index: trunk/doc
===================================================================
--- trunk/doc	2018-09-19 11:51:58 UTC (rev 171)
+++ trunk/doc	2018-09-20 08:29:49 UTC (rev 172)

Property changes on: trunk/doc
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
+ehs.tag
 html
 manual.dox
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.