-Summary: gCVS is a GTK port of WinCVS, a Windows-based CVS client
-Summary(pl): Sportowany pod gtk WinCVS - klient CVS
+Summary: gCVS is a GTK+ port of WinCVS, a Windows-based CVS client
+Summary(pl): Sportowany pod GTK+ WinCVS - klient CVS
Name: gcvs
Version: 1.0
-Release: 1
+Release: 4
Epoch: 2
License: GPL
Group: Applications/Communications
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-nocvsunix.patch
+Patch1: %{name}-ambiguous.patch
+Patch2: %{name}-types.patch
URL: http://www.wincvs.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-gCVS is a GTK port of WinCVS, a Windows-based CVS client.
+gCVS is a GTK+ port of WinCVS, a Windows-based CVS client.
%description -l pl
-gCVS jest bazowanym na Windows klientem CVS, u¿ywaj±cym bibliotek GTK.
-Pozwala na wygodne operacje w CVS poprzez graficzny interfejs.
+gCVS to sportowana na GTK+ wersja WinCVS - klienta CVS opartego na
+Windows. Pozwala na wygodne operacje w CVS poprzez graficzny
+interfejs.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
-rm -f missing
%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
-CXXFLAGS="%{rpmcflags} %{!?debug:-fno-rtti}"
+CXXFLAGS="%{rpmcflags} -fno-rtti"
%configure
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Development,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Development/gcvs.desktop
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/gcvs.desktop
install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
%clean
%doc GuiDoc/cvsgui*html
%attr(755,root,root) %{_bindir}/*
%{_datadir}/%{name}
-%{_applnkdir}/Development/gcvs.desktop
+%{_desktopdir}/gcvs.desktop
%{_pixmapsdir}/gcvs.png