Author: qboosh                       Date: Mon Feb 28 07:35:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.7.2, updated system-assuan patch, added info patch
- added gtk2 version

---- Files affected:
SPECS:
   pinentry.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/pinentry.spec
diff -u SPECS/pinentry.spec:1.14 SPECS/pinentry.spec:1.15
--- SPECS/pinentry.spec:1.14    Sat Dec 25 19:04:56 2004
+++ SPECS/pinentry.spec Mon Feb 28 08:35:47 2005
@@ -1,27 +1,31 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without gtk     # without GTK+ dialog
+%bcond_without gtk     # without GTK+ 1.x dialog
+%bcond_without gtk2    # without GTK+ 2 dialog
 %bcond_without qt      # without Qt dialog
 #
 Summary:       Simple PIN or passphrase entry dialogs
 Summary(pl):   Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
 Name:          pinentry
-Version:       0.7.1
+Version:       0.7.2
 Release:       1
 License:       GPL
 Group:         Applications
 Source0:       ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
-# Source0-md5: 7861d63dea6434a5a05da84e83f209e6
+# Source0-md5: 55626ce13ed76d82ec5330d19bdf3ab4
 Patch0:                %{name}-system-assuan.patch
+Patch1:                %{name}-info.patch
 URL:           http://www.gnupg.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.7.6
 %{?with_gtk:BuildRequires:     gtk+-devel >= 1.2.0}
+%{?with_gtk2:BuildRequires:    gtk+2-devel >= 2:2.4.0}
 BuildRequires: libassuan-devel >= 1:0.6.0
 BuildRequires: libcap-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
 %{?with_qt:BuildRequires:      qt-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,15 +42,27 @@
 Podstawowy pakiet zawiera kontrolkę opartą na curses.
 
 %package gtk
-Summary:       Simple PIN or passphrase entry dialog for GTK+
-Summary(pl):   Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla 
GTK+
+Summary:       Simple PIN or passphrase entry dialog for GTK+ 1.x
+Summary(pl):   Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla 
GTK+ 1.x
 Group:         X11/Applications
 
 %description gtk
-Simple PIN or passphrase entry dialog for GTK+.
+Simple PIN or passphrase entry dialog for GTK+ 1.x.
 
 %description gtk -l pl
-Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+.
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 1.x.
+
+%package gtk2
+Summary:       Simple PIN or passphrase entry dialog for GTK+ 2
+Summary(pl):   Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla 
GTK+ 2
+Group:         X11/Applications
+Requires:      gtk+2 >= 2:2.4.0
+
+%description gtk2
+Simple PIN or passphrase entry dialog for GTK+ 2.
+
+%description gtk2 -l pl
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 2.
 
 %package qt
 Summary:       Simple PIN or passphrase entry dialog for Qt
@@ -62,9 +78,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -74,6 +91,7 @@
        --enable-fallback-curses \
        --enable-pinentry-curses \
        --%{!?with_gtk:dis}%{?with_gtk:en}able-pinentry-gtk \
+       --%{!?with_gtk2:dis}%{?with_gtk2:en}able-pinentry-gtk2 \
        --%{!?with_qt:dis}%{?with_qt:en}able-pinentry-qt \
        --with-qt-includes=/usr/include/qt
 
@@ -106,6 +124,12 @@
 %attr(755,root,root) %{_bindir}/pinentry-gtk
 %endif
 
+%if %{with gtk2}
+%files gtk2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pinentry-gtk-2
+%endif
+
 %if %{with qt}
 %files qt
 %defattr(644,root,root,755)
@@ -118,6 +142,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/02/28 07:35:47  qboosh
+- updated to 0.7.2, updated system-assuan patch, added info patch
+- added gtk2 version
+
 Revision 1.14  2004/12/25 18:04:56  qboosh
 - automake epoch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pinentry.spec?r1=1.14&r2=1.15&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to