aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-07-12 14:54:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-07-12 14:54:45 +0000
commitf96faeb54880089b7d9e7aab4121b1e642b4b2f3 (patch)
tree4b22d643233b33e0744a4fd4f1a09c4562b4e5ca
parentba69ceeb9733ca263131b51083c6a9aa7a2a6988 (diff)
downloadmonitor-edid-f96faeb54880089b7d9e7aab4121b1e642b4b2f3.tar
monitor-edid-f96faeb54880089b7d9e7aab4121b1e642b4b2f3.tar.gz
monitor-edid-f96faeb54880089b7d9e7aab4121b1e642b4b2f3.tar.bz2
monitor-edid-f96faeb54880089b7d9e7aab4121b1e642b4b2f3.tar.xz
monitor-edid-f96faeb54880089b7d9e7aab4121b1e642b4b2f3.zip
- switch to utf8
- use a fixed FontPath (do not default to unix:-1 in case xfs is not running) - add standard cvs warning - merge in monitor-edid-1.9-5mdv2007.0's changes - fix a segfault occuring on some boxes in monitor-get-edid-using-vbe, when using try-in-console - set url to wiki page instead of the cvs (was done on Mar 10 2006) (was committed in CVS instead of SVN)
-rw-r--r--monitor-edid.spec63
1 files changed, 41 insertions, 22 deletions
diff --git a/monitor-edid.spec b/monitor-edid.spec
index 98bf521..74b9c88 100644
--- a/monitor-edid.spec
+++ b/monitor-edid.spec
@@ -1,16 +1,19 @@
-%define name monitor-edid
-%define version 1.9
-%define release 2mdk
-
-Summary: Get monitor details
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source0: %{name}-%{version}.tar.bz2
-License: GPL
-Group: System/Configuration/Other
-Url: http://www.mandrivalinux.com/cgi-bin/cvsweb.cgi/soft/monitor-edid
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# EDIT IN CVS NOT IN SOURCE PACKAGE (NO PATCH ALLOWED).
+
+%define name monitor-edid
+%define version 1.10
+%define release %mkrel 1
+
+Summary: Get monitor details
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Source0: %{name}-%{version}.tar.bz2
+License: GPL
+Group: System/Configuration/Other
+Url: http://qa.mandriva.com/twiki/bin/view/Main/Monitor-edid
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+ExcludeArch: %{sunsparc}
%description
This package will try to read the monitor details directly from the
@@ -20,17 +23,17 @@ monitor.
%setup -q
%build
-make
+%make CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%_bindir
-install -d $RPM_BUILD_ROOT%_sbindir
-install monitor-edid monitor-get-edid-using-vbe monitor-probe monitor-probe-using-X $RPM_BUILD_ROOT%_sbindir
-install monitor-parse-edid $RPM_BUILD_ROOT%_bindir
-install cvt $RPM_BUILD_ROOT%_bindir/vesa-cvt
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_sbindir}
+install monitor-edid monitor-get-edid-using-vbe monitor-probe monitor-probe-using-X $RPM_BUILD_ROOT%{_sbindir}
+install monitor-parse-edid $RPM_BUILD_ROOT%{_bindir}
+install cvt $RPM_BUILD_ROOT%{_bindir}/vesa-cvt
-ln -s monitor-edid $RPM_BUILD_ROOT%_sbindir/monitor-get-edid
+ln -s monitor-edid $RPM_BUILD_ROOT%{_sbindir}/monitor-get-edid
%clean
rm -rf $RPM_BUILD_ROOT
@@ -38,10 +41,26 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README
-%_bindir/*
-%_sbindir/*
+%{_bindir}/*
+%{_sbindir}/*
%changelog
+* Tue Jul 11 2006 Pixel <pixel@mandriva.com> 1.10-1mdv2007.0
+- use a fixed FontPath (do not default to unix:-1 in case xfs is not running)
+
+* Wed Jun 07 2006 Per Øyvind Karlsen <pkarlsen@mandriva.com> 1.9-5mdv2007.0
+- do not build on sparc
+- build with $RPM_OPT_FLAGS
+- do parallell build
+- cosmetics
+
+* Wed May 10 2006 Pixel <pixel@mandriva.com> 1.9-4mdk
+- fix a segfault occuring on some boxes in monitor-get-edid-using-vbe,
+ when using try-in-console
+
+* Fri Mar 10 2006 Pixel <pixel@mandriva.com> 1.9-3mdk
+- set url to wiki page instead of the cvs
+
* Fri Jan 6 2006 Pixel <pixel@mandriva.com> 1.9-2mdk
- add missing monitor-get-edid