Перенос изменений из ветки devel

fbe5a975 · Pavel Vainerman · 2ed382d6 · fbe5a975
Commit fbe5a975 authored Jul 26, 2016 by Pavel Vainerman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

libuniset2.spec conf/libuniset2.spec +4 -1

No files found.
--- a/conf/libuniset2.spec
+++ b/conf/libuniset2.spec
@@ -14,7 +14,7 @@

 Name: libuniset2
 Version: 2.4
-Release: alt2
+Release: alt3
 Summary: UniSet - library for building distributed industrial control systems

 License: LGPL
@@ -484,6 +484,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..

 %changelog
+* Tue Jul 26 2016 Pavel Vainerman <pv@altlinux.ru> 2.4-alt3
+- merge devel/master
+
 * Tue Jul 26 2016 Pavel Vainerman <pv@altlinux.ru> 2.4-alt2
 - minor fixes