commit 515f243b5a0ed319ccf85635f2470d398c62f463
Author: Jakub Bogusz <[email protected]>
Date: Mon Aug 12 18:52:09 2024 +0200
- new Source URLs (now part of xorg/app), updated to 0.8.0
xinput_calibrator.spec | 40 ++++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/xinput_calibrator.spec b/xinput_calibrator.spec
index 67a3186..aed85f1 100644
--- a/xinput_calibrator.spec
+++ b/xinput_calibrator.spec
@@ -1,20 +1,33 @@
+#
+# Conditional build:
+%bcond_without gtk # GTK 2.x GUI (instead of native X11)
+
Summary: A generic touchscreen calibration program for X.Org
Summary(pl.UTF-8): Ogólny program do kalibracji ekranów dotykowych dla
X.Org
Name: xinput_calibrator
-Version: 0.7.5
+Version: 0.8.0
Release: 1
License: MIT
Group: X11/Applications
-Source0:
https://github.com/tias/xinput_calibrator/archive/v%{version}.tar.gz
-# Source0-md5: b9fcb2c175a73e3c86af7688073de338
-URL: http://www.freedesktop.org/wiki/Software/xinput_calibrator
-BuildRequires: autoconf
+Source0:
https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz
+# Source0-md5: ffeaf476092b2accd8cbdcba7bcab543
+URL: https://www.freedesktop.org/wiki/Software/xinput_calibrator/
+BuildRequires: autoconf >= 2.71
BuildRequires: automake
-BuildRequires: desktop-file-utils
-BuildRequires: gtk+2-devel
-BuildRequires: libtool
+#BuildRequires: desktop-file-utils
+%{?with_gtk:BuildRequires: gtkmm-devel >= 2.4}
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:2
BuildRequires: pkgconfig
+BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXi-devel >= 1.2
+%{!?with_gtk:BuildRequires: xorg-lib-libXrandr-devel}
BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: xorg-proto-inputproto-devel >= 1.5
+BuildRequires: xz
+Requires: xorg-lib-libXi >= 1.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -46,8 +59,7 @@ potrzeby używania z X Window System. Aktualne możliwości to
m.in:
%{__autoconf}
%{__automake}
%configure \
- --with-gui=gtkmm \
- --with-gui=x11
+ --with-gui=%{?with_gtk:gtkmm}%{!?with_gtk:x11}
%{__make}
@@ -60,16 +72,16 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# Install xinput_calibrator.desktop :
-desktop-file-install \
- --dir=$RPM_BUILD_ROOT%{_desktopdir} \
- ./scripts/%{name}.desktop
+#desktop-file-install \
+# --dir=$RPM_BUILD_ROOT%{_desktopdir} \
+# ./scripts/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README Changelog
+%doc COPYING Changelog README.md
%attr(755,root,root) %{_bindir}/xinput_calibrator
%{_mandir}/man1/xinput_calibrator.1*
%{_desktopdir}/xinput_calibrator.desktop
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xinput_calibrator.git/commitdiff/515f243b5a0ed319ccf85635f2470d398c62f463
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
