commit ff6b33c64776a86b3ada2c9becac54eb4b6cab9e
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Sep 22 21:52:55 2018 +0200
- up to 4.2.2
format-security.patch | 11 -----------
omniORB.spec | 19 ++++++++++---------
2 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/omniORB.spec b/omniORB.spec
index cac17c1..2914395 100644
--- a/omniORB.spec
+++ b/omniORB.spec
@@ -1,19 +1,19 @@
# TODO:
# - ditto for documentation
+# - drop skip_post_check_so for libomniZIOPDynamic4.so and fix linking instead
Summary: Object Request Broker (ORB) from AT&T (CORBA 2.6)
Summary(pl.UTF-8): Object Request Broker (ORB) z AT&T (CORBA 2.6)
Name: omniORB
-Version: 4.1.7
-Release: 2
+Version: 4.2.2
+Release: 1
License: GPL/LGPL
Group: Libraries
Source0:
http://download.sourceforge.net/omniorb/%{name}-%{version}.tar.bz2
-# Source0-md5: ce8cbe25418a76a2aac5395399463362
+# Source0-md5: cc6b2a65a2b1c1b3d44b3ccbaf92e104
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.sysconfig
Patch0: %{name}-openssl.patch
-Patch1: format-security.patch
URL: http://omniorb.sourceforge.net/
BuildRequires: libstdc++-devel
BuildRequires: openssl-devel >= 0.9.7d
@@ -27,7 +27,7 @@ Requires: %{name}-libs = %{version}-%{release}
Conflicts: logrotate < 3.7-4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define skip_post_check_so _omniidlmodule\.so\..*
libCOS.\.so\..* libCOSDynamic.\.so\..*
+%define skip_post_check_so _omniidlmodule\.so\..*
libCOS.\.so\..* libCOSDynamic.\.so\..* libomniZIOPDynamic4\.so\..*
%description
omniORB is an Object Request Broker (ORB) which implements
@@ -102,7 +102,6 @@ Dodatkowe narzędzia dla %{name}.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%configure \
@@ -158,7 +157,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc ReleaseNotes.txt CREDITS README.{FIRST.txt,unix}
+%doc ReleaseNotes.txt CREDITS README.{FIRST,unix}.txt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.cfg
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/%{name}
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
@@ -174,8 +173,8 @@ fi
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.1
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.3
+%attr(755,root,root) %ghost %{_libdir}/lib*.so.2
+%attr(755,root,root) %ghost %{_libdir}/lib*.so.4
%{_datadir}/idl/%{name}
%files devel
@@ -186,6 +185,7 @@ fi
%attr(755,root,root) %{_libdir}/lib*.so
%{_includedir}/*
%{_pkgconfigdir}/*.pc
+%{_mandir}/man1/omnicpp.1*
%files static
%defattr(644,root,root,755)
@@ -206,5 +206,6 @@ fi
%attr(755,root,root) %{_bindir}/genior
%attr(755,root,root) %{_bindir}/nameclt
%{_mandir}/man1/catior*
+%{_mandir}/man1/convertior.1*
%{_mandir}/man1/genior*
%{_mandir}/man1/nameclt*
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index be8a7ab..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- omniORB-4.1.7/src/tool/omniidl/cxx/cccp/cccp.c~ 2006-08-02
16:26:34.000000000 +0200
-+++ omniORB-4.1.7/src/tool/omniidl/cxx/cccp/cccp.c 2013-12-07
17:48:14.579353579 +0100
-@@ -8034,7 +8034,7 @@
- else
- parse_error = macarg (NULL_PTR, 0);
- if (parse_error) {
-- error_with_line (line_for_error (start_line), parse_error);
-+ error_with_line (line_for_error (start_line), "%s", parse_error);
- break;
- }
- i++;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/omniORB.git/commitdiff/ff6b33c64776a86b3ada2c9becac54eb4b6cab9e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
