Add patch to fix getopt usage again

This commit is contained in:
Orion Poplawski 2016-08-12 15:09:07 -06:00
parent 90875a3a30
commit 63c77afdee
2 changed files with 17 additions and 1 deletions

12
libdap-getopt.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up libdap-3.18.1/unit-tests/D4FilterClauseTest.cc.getopt libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
--- libdap-3.18.1/unit-tests/D4FilterClauseTest.cc.getopt 2016-05-05 17:43:15.000000000 -0600
+++ libdap-3.18.1/unit-tests/D4FilterClauseTest.cc 2016-08-12 14:00:24.398185600 -0600
@@ -566,7 +566,7 @@ int main(int argc, char*argv[]) {
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
GetOpt getopt(argc, argv, "d");
- char option_char;
+ int option_char;
while ((option_char = getopt()) != EOF)
switch (option_char) {

View File

@ -8,7 +8,9 @@ Group: Development/Libraries
URL: http://www.opendap.org/
Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
#Don't run HTTP tests - builders don't have network connections
Patch0: libdap-offline.patch
Patch0: libdap-offline.patch
# Fix getopt() usage again
Patch1: libdap-getopt.patch
# For autoreconf
BuildRequires: libtool
@ -63,6 +65,7 @@ Documentation of the libdap library.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .offline
%patch1 -p1 -b .getopt
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@ -133,6 +136,7 @@ make check
%changelog
* Fri Aug 12 2016 Orion Poplawski <orion@cora.nwra.com> - 3.18.1-1
- Update to 3.18.1
- Add patch to fix getopt usage again
* Thu Aug 11 2016 Michal Toman <mtoman@fedoraproject.org> - 3.17.2-2
- No valgrind on MIPS