diff --git a/0001-Revert-part-of-f406941a8a2ec.patch b/0001-Revert-part-of-f406941a8a2ec.patch new file mode 100644 index 0000000..ea4457b --- /dev/null +++ b/0001-Revert-part-of-f406941a8a2ec.patch @@ -0,0 +1,31 @@ +From a5252d4900246dca292246a6375e239db1b190e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 5 Oct 2015 10:26:11 -0400 +Subject: [PATCH] Revert part of f406941a8a2ec + +Build fails with: +./unicase/locale-languages.gperf:271: declarations are not allowed in the keywords section. +To declare a keyword starting with %, enclose it in double-quotes. +(On Fedora 24 rawhide) +--- + lib/unicase/locale-languages.gperf | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/unicase/locale-languages.gperf b/lib/unicase/locale-languages.gperf +index fd566f9971..da0d94e7b1 100644 +--- a/lib/unicase/locale-languages.gperf ++++ b/lib/unicase/locale-languages.gperf +@@ -268,10 +268,3 @@ + "zh", /* Chinese" */ + "zu", /* Zulu" */ + "zap", /* Zapotec" */ +-%{ +-/* +- * Local Variables: +- * coding: utf-8 +- * End: +- */ +-%} +-- +2.1.0 + diff --git a/gnulib.spec b/gnulib.spec index 012257e..e354bbb 100644 --- a/gnulib.spec +++ b/gnulib.spec @@ -1,39 +1,39 @@ -%global commit 090526e76464e472a70f5e64e1256dd38313b002 -# %global tag 11 #disabled due to unarragment release line after mass rebuild. +%global commit a5a1569d1953536af019636c49bd3e7a5cbbbde2 +# %%global tag 11 #disabled due to unarragment release line after mass rebuild. %global githead %(printf %%.7s %commit) -%global gitdate 20150706 +%global gitdate 20150928 # epel7 compatibility mode %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} # Module Sample: (Alpha Version) -# % global moduleX %name-of-module +# %% global moduleX %%name-of-module # -# % package -n %{moduleX} -# Summary: %{summary_of_moduleX} -# License: %{license_of_moduleX} +# %% package -n %%{moduleX} +# Summary: %%{summary_of_moduleX} +# License: %%{license_of_moduleX} # -# % description -n %{moduleX} -# %description-of-module +# %% description -n %%{moduleX} +# %%description-of-module # -# % prep -# ./gnulib-tool --create-testdir --dir=build-%{moduleX} %{moduleX} +# %% prep +# ./gnulib-tool --create-testdir --dir=build-%%{moduleX} %%{moduleX} # -# % build -# pushd build-%{moduleX} -# % configure --prefix=%_prefix -# make %{?_smp_mflags} +# %% build +# pushd build-%%{moduleX} +# %% configure --prefix=%%_prefix +# make %%{?_smp_mflags} # popd # -# % install -# pushd build-%{moduleX} -# %make_install +# %% install +# pushd build-%%{moduleX} +# %%make_install # popd -# help2man -N --no-discard-stderr %{buildroot}%{_bindir}/%{moduleX} | gzip -9c > %{buildroot}%{_mandir}/man1/%{moduleX}.1.gz +# help2man -N --no-discard-stderr %%{buildroot}%%{_bindir}/%%{moduleX} | gzip -9c > %%{buildroot}%%{_mandir}/man1/%%{moduleX}.1.gz # -# % files -n %{moduleX} -# %{_bindir}/%{moduleX} -# %{_mandir}/*/%{moduleX}.* +# %% files -n %%{moduleX} +# %%{_bindir}/%%{moduleX} +# %%{_mandir}/*/%%{moduleX}.* ################################## # LIST OF SINGLE MODULE PACKAGES : @@ -46,16 +46,19 @@ The GNU portability library is a macro system and C declarations and \ definitions for commonly-used API elements and abstracted system behaviors. \ It can be used to improve portability and other functionality in your programs. -Name: gnulib -Version: 0 -Release: 15.%{gitdate}git%{?dist} -Summary: GNU Portability Library -Group: Development/System -License: Public Domain and BSD and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2 and LGPLv2+ and LGPLv3+ -URL: http://www.gnu.org/software/gnulib -Source0: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=%{githead};sf=tgz;name=gnulib-%{githead}.tar.gz -Source1: http://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/check-module.1 -Source2: http://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/gnulib-tool.1 +Name: gnulib +Version: 0 +Release: 15.%{gitdate}git%{?dist} +Summary: GNU Portability Library +Group: Development/System +License: Public Domain and BSD and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2 and LGPLv2+ and LGPLv3+ +URL: http://www.gnu.org/software/gnulib +Source0: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=%{githead};sf=tgz;name=gnulib-%{githead}.tar.gz +Source1: http://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/check-module.1 +Source2: http://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/gnulib-tool.1 + +Patch0: 0001-Revert-part-of-f406941a8a2ec.patch + BuildRequires: texinfo BuildRequires: java-devel @@ -65,12 +68,13 @@ BuildRequires: bison BuildRequires: gperf BuildRequires: libtool BuildRequires: help2man +BuildRequires: git %description %common_desc %prep -%setup -q -n %{name}-%{githead} +%autosetup -n %{name}-%{githead} -p1 -Sgit #modules not to be tested by direct import toRemove="lib-symbol-visibility havelib .*-obsolete localcharset gettext-h gettext alloca-opt alloca " @@ -214,6 +218,9 @@ It can be enabled for specific files by setting appropriate git attributes. #------------------------------------------------------------------------- %changelog +* Mon Sep 28 2015 Zbigniew Jędrzejewski-Szmek - 0-15.20150928git +- Update on 20150928. + * Mon Jul 6 2015 Zbigniew Jędrzejewski-Szmek - 0-15.20150706git - Update on 20150706. - Fixes #1239538. @@ -277,7 +284,7 @@ It can be enabled for specific files by setting appropriate git attributes. - Update. * Thu Nov 14 2013 Mosaab Alzoubi - 0-2.20131112git -- Fix tag method to 0-$rel.$gitdategit instead of $ver.git$gitdate-$rel. +- Fix tag method to 0-$rel.$gitdategit instead of $ver.git$gitdate-$rel. - Release number will increas by new git snapshot. * Tue Nov 12 2013 Mosaab Alzoubi - 0.1.git20131112-1