diff --git a/CMakeLists.txt b/CMakeLists.txt index 75469eb..17b6f3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ PROJECT(netcat-openbsd C) SET(CMAKE_VERBOSE_MAKEFILE ON) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -W -Wall") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -g -W -Wall") #please fix cmake to avoid this %$#$#$ , there is no findGlib2.cmake built-in ! FIND_PATH(GLIB2_INCLUDE_DIR NAMES glib.h glibconfig.h PATHS /usr/include/glib-2.0) diff --git a/netcat-openbsd.changes b/netcat-openbsd.changes index 20f94cd..cec43e7 100644 --- a/netcat-openbsd.changes +++ b/netcat-openbsd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 10 17:46:07 UTC 2011 - crrodriguez@opensuse.org + +- Update xbuntu patches. +- Ensure we have large file support in 32 bit builds +- Fix rpmlint warnings + ------------------------------------------------------------------- Sat Jul 16 13:34:18 UTC 2011 - andrea.turrini@gmail.com diff --git a/netcat-openbsd.spec b/netcat-openbsd.spec index 4c821a9..bdf1685 100644 --- a/netcat-openbsd.spec +++ b/netcat-openbsd.spec @@ -30,8 +30,8 @@ Group: Productivity/Networking/Other Summary: TCP/IP swiss army knife Source: %{name}-%{version}.tar.bz2 Source1: CMakeLists.txt -Patch0: netcat-openbsd_1.89-3ubuntu2.diff.gz -Provides: nc6 = %{version} netcat +Patch0: netcat-openbsd_1.89-4ubuntu1.diff.gz +Provides: nc6 = %{version} netcat = %{version} Obsoletes: nc6 <= 1.0 netcat <= 1.10 %description @@ -80,9 +80,9 @@ rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) %{_bindir}/nc -%{_bindir}/netcat +%ghost %{_bindir}/netcat %{_mandir}/man1/nc.1.gz -%{_mandir}/man1/netcat.1.gz +%ghost %{_mandir}/man1/netcat.1.gz %ghost /etc/alternatives/netcat %ghost /etc/alternatives/netcat.1.gz diff --git a/netcat-openbsd_1.89-3ubuntu2.diff.gz b/netcat-openbsd_1.89-3ubuntu2.diff.gz deleted file mode 100644 index d6f103e..0000000 --- a/netcat-openbsd_1.89-3ubuntu2.diff.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d8675094ddff72ff17a866357428d645f422f89e1cee8c065aa05362dbf7af2 -size 31074 diff --git a/netcat-openbsd_1.89-4ubuntu1.diff.gz b/netcat-openbsd_1.89-4ubuntu1.diff.gz new file mode 100644 index 0000000..a6ac943 --- /dev/null +++ b/netcat-openbsd_1.89-4ubuntu1.diff.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c5614d3955ab8db5814a4779cb627d91bb3f6cb2360a216264c266cf4e1c5d6 +size 32444