diff --git a/.cvsignore b/.cvsignore index 51beb07..e79341d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unifdef-1.171.tar.bz2 +unifdef-1.334.tar.gz diff --git a/sources b/sources index b8f0011..5d57b8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -657e97bab7cfed217f3a7c73fba9f1cb unifdef-1.171.tar.bz2 +051a5bb3df4cddce411db709d0167e3e unifdef-1.334.tar.gz diff --git a/unifdef-strlcpy.patch b/unifdef-strlcpy.patch new file mode 100644 index 0000000..0fb8714 --- /dev/null +++ b/unifdef-strlcpy.patch @@ -0,0 +1,12 @@ +diff -up unifdef-1.334/unifdef.c.strlcpy unifdef-1.334/unifdef.c +--- unifdef-1.334/unifdef.c.strlcpy 2010-01-19 16:48:31.000000000 -0800 ++++ unifdef-1.334/unifdef.c 2010-02-11 16:56:08.000000000 -0800 +@@ -56,6 +56,8 @@ + #include + #include + ++#include ++ + const char * const copyright[] = { + "@(#) Copyright (c) 2002 - 2010 Tony Finch (dot@dotat.at)\n", + "@(#) Latest version available from http://dotat.at/prog/unifdef\n", diff --git a/unifdef.spec b/unifdef.spec index c887fad..6d28ca6 100644 --- a/unifdef.spec +++ b/unifdef.spec @@ -1,14 +1,17 @@ -Summary: Unifdef tool for removing ifdef'd lines +Summary: Tool for removing ifdef'd lines Name: unifdef -Version: 1.171 -Release: 9%{?dist} +Version: 1.334 +Release: 1%{?dist} License: BSD Group: Development/Languages -URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/ -Source0: unifdef-1.171.tar.bz2 -Patch0: fix-getline-splosion.patch +URL: http://dotat.at/prog/unifdef/ +Source0: http://dotat.at/prog/unifdef/unifdef-%{version}.tar.gz +Patch0: unifdef-strlcpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libbsd-devel +BuildRequires: pkgconfig + %description Unifdef is useful for removing ifdefed lines from a file while otherwise leaving the file alone. Unifdef acts on #ifdef, #ifndef, #else, and #endif @@ -20,7 +23,7 @@ is inactive because it is inside a comment, or a single or double quote. %patch0 -p1 %build -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS `pkg-config --libs libbsd`" %install rm -rf $RPM_BUILD_ROOT @@ -43,8 +46,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 11 2010 Eric Smith 1.334-1 +- Remove package name from summary +- Change URL from FreeBSD CVS to project home page +- Update source to upstream 1.334 +- No longer need getline() patch +- Use strlcpy from libbsd + * Fri Jan 15 2010 Kyle McMartin 1.171-10 -- fix unifdef ftbfs (rhbz#511553) +- fix unifdef ftbfs * Sun Jul 26 2009 Fedora Release Engineering - 1.171-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild