- up to 2.0.0

Changed files:
    read-edid-get-edid-ppc.sh -> 1.2
    read-edid.spec -> 1.5

diff --git a/read-edid-get-edid-ppc.sh b/read-edid-get-edid-ppc.sh
deleted file mode 100644 (file)
index 94b387d..0000000
--- a/read-edid-get-edid-ppc.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2004 Colin Watson <cjwatson@debian.org>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-set -e
-
-TREE=/proc/device-tree
-
-# Apparently some 2.4 kernels put OF aliases in aliases@0.
-if [ -d /proc/device-tree/aliases ]; then
-       ALIASES=aliases
-elif [ -d /proc/device-tree/aliases@0 ]; then
-       ALIASES=aliases@0
-else
-       echo "Can't find Open Firmware aliases directory" >&2
-       exit 2
-fi
-
-if [ -f "$TREE/$ALIASES/screen" ]; then
-       SCREEN="`cat $TREE/$ALIASES/screen`"
-else
-       echo "Can't find Open Firmware screen alias" >&2
-       exit 2
-fi
-
-# Aliases start with a slash.
-if [ -d "$TREE$SCREEN" ]; then
-       EDID=
-       # List gathered from files in drivers/video/ in the 2.6.7 kernel
-       # source.
-       for file in DFP,EDID LCD,EDID EDID EDID1 EDID2 EDID,B EDID,A; do
-               if [ -f "$TREE$SCREEN/$file" ]; then
-                       EDID="$TREE$SCREEN/$file"
-                       break
-               fi
-       done
-       if [ -z "$EDID" ]; then
-               echo "Can't find EDID file in $TREE$SCREEN" >&2
-               exit 1
-       fi
-else
-       echo "Can't find target of Open Firmware screen alias ($TREE$SCREEN)" >&2
-       exit 2
-fi
-
-cat "$EDID"

diff --git a/read-edid.spec b/read-edid.spec
index af94a13d0a505c7d8536d50b0b35038a040e8c1e..85c798ebc5d0556fd1f82d4f91f2fa15173e71bd 100644 (file)
--- a/read-edid.spec
+++ b/read-edid.spec
@@ -1,14 +1,14 @@
 Summary:       Gets various useful informations from a conforming PnP monitor
 Summary(pl.UTF-8):     Pobieranie różnych przydatnych informacji z monitora zgodnego z PnP
 Name:          read-edid
-Version:       1.4.1
-Release:       0.1
+Version:       2.0.0
+Release:       1
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://john.fremlin.de/programs/linux/read-edid/%{name}-%{version}.tar.gz
-# Source0-md5: aadc9a21ea4a1c9819757cda973372f4
-Source1:       %{name}-get-edid-ppc.sh
-URL:           http://john.fremlin.de/programs/linux/read-edid/index.html
+Source0:       http://polypux.org/projects/read-edid/%{name}-%{version}.tar.gz
+# Source0-md5: 586e7fa1167773b27f4e505edc93274b
+URL:           http://polypux.org/projects/read-edid/
+BuildRequires: libx86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,26 +49,13 @@ dla architektur i386 i powerpc.
 
 %build
 %configure
-%{__make} \
-%ifnarch %{ix86}
-       parse-edid
-%endif
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
-install parse-edid $RPM_BUILD_ROOT%{_bindir}/parse-edid
-
-%ifarch %{ix86}
-install get-edid $RPM_BUILD_ROOT%{_bindir}/get-edid
-%endif
-%ifarch ppc
-install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/get-edid
-%endif
-
-install get-edid.man $RPM_BUILD_ROOT%{_mandir}/man1/get-edid.1
-echo ".so get-edid.1" > $RPM_BUILD_ROOT%{_mandir}/man1/parse-edid.1
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,11 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%ifarch %{ix86}
-%doc LRMI
-%endif
-%attr(755,root,root) %{_bindir}/parse-edid
-%ifarch %{ix86} ppc
-%attr(755,root,root) %{_bindir}/get-edid
-%endif
+%attr(755,root,root) %{_sbindir}/parse-edid
+%attr(755,root,root) %{_sbindir}/get-edid
 %{_mandir}/man1/*-edid.1*