- glibc patch: resolve getopt declaration conflict

[packages/cdecl.git] / cdecl.spec

diff --git a/cdecl.spec b/cdecl.spec
index 106ba5571bfbd9422543ef34cd40b0aa8e1480d4..44418bb8f7da2e669381d572f4292dcb2cfed440 100644 (file)
--- a/cdecl.spec
+++ b/cdecl.spec
@@ -1,36 +1,40 @@
 Summary:       Programs for encoding and decoding C and C++ function declarations
 Summary(de):   Übersetzer von Deklarationen zwischen Englisch und C/C++
 Summary(fr):   Traducteur anglais <--> déclarations C/C++
+Summary(pl):   Programy do kodowania i dekodowania deklaracji funkcji w C i C++
 Summary(tr):   Ýngilizceden C/C++ bildirimlerine çevirici
 Name:          cdecl
 Version:       2.5
-Release:       14
-Copyright:     distributable
+Release:       21
+License:       distributable
 Group:         Development/Tools
+Group(de):     Entwicklung/Werkzeuge
 Group(fr):     Development/Outils
 Group(pl):     Programowanie/Narzêdzia
-Source:                ftp://sunsite.unc.edu/pub/Linux/devel/lang/c/%{name}-%{version}.tar.gz
-Patch:         cdecl-misc.patch
-BuildRequires: byacc
-BuildRequires: ncurses-devel >= 5.0
-BuildRequires: readline-devel >= 4.1
-BuildRoot:     /tmp/%{name}-%{version}-root
+Source0:       ftp://sunsite.unc.edu/pub/Linux/devel/lang/c/%{name}-%{version}.tar.gz
+Patch0:                %{name}-misc.patch
+Patch1:                %{name}-glibc.patch
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: readline-devel >= 4.2
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The cdecl package includes the cdecl and c++decl utilities, which are used
-to translate English to C or C++ function declarations and vice versa.
+The cdecl package includes the cdecl and c++decl utilities, which are
+used to translate English to C or C++ function declarations and vice
+versa.
 
-%description
-Pakiet cdecl zawiera narzêdzia cdecl oraz c++decl, których u¿ywa sie do 
-t³umaczenia deklaracji funkcji C lub C++ na angielski i vice versa.
+%description -l pl
+Pakiet cdecl zawiera narzêdzia cdecl oraz c++decl, których u¿ywa siê
+do t³umaczenia deklaracji funkcji C lub C++ na angielski i vice versa.
 
 %description -l de
 Dies ist ein Paket zum Übersetzen von Englisch in C/C++
 Funktionsanweisungen und umgekehrt. Nützlich für Programmierer.
 
 %description -l fr
-C'est un package pour traduire de l'anglais en déclarations de fonctions
-C/C++ et vice-versa. Utile pour les programmeurs.
+C'est un package pour traduire de l'anglais en déclarations de
+fonctions C/C++ et vice-versa. Utile pour les programmeurs.
 
 %description -l tr
 Ýngilizceden C/C++ bildirimlerine çeviri iþlemini ve tersini
@@ -39,22 +43,22 @@ kullan
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -DUSE_READLINE -s" \
+bison -y cdgram.y && mv -f y.tab.c cdgram.c
+%{__make} CFLAGS="%{rpmcflags} %{rpmldflags} -DUSE_READLINE" \
        LIBS="-lreadline -ltinfo"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
-make install \
+%{__make} install \
        BINDIR=$RPM_BUILD_ROOT%{_bindir} \
        MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*
-
 %clean
 rm -rf $RPM_BUILD_ROOT