From d1ca189c474915a66264af45d25264037f1a4674 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 26 Sep 2007 09:47:43 +0000 Subject: get rid of spec and rpm targets in Makefile --- Makefile | 37 ++++++--------------- monitor-edid.spec | 96 ------------------------------------------------------- 2 files changed, 10 insertions(+), 123 deletions(-) delete mode 100644 monitor-edid.spec diff --git a/Makefile b/Makefile index d6cec73..e49ba69 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PACKAGE = monitor-edid -VERSION = $(shell rpm -q --qf "%{VERSION}\n" --specfile $(PACKAGE).spec | head -n 1) +NAME = monitor-edid +VERSION = 1.11 FILES = $(shell ls | grep -v CVS | grep -vF .tar) ARCH := $(patsubst i%86,i386,$(shell uname -m)) @@ -42,33 +42,16 @@ clean: $(MAKE) -C int10 clean $(MAKE) -C x86emu clean $(RM) $(TARGETS) *.a *.o *~ - rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2 + rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2 %.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -# rules to build a test rpm - -localsrpm: localdist - rpm -ts $(PACKAGE)-$(VERSION).tar.bz2 - -localrpm: localdist buildrpm - -localdist: cleandist dir localcopy tar - -cleandist: clean - -dir: - mkdir $(PACKAGE)-$(VERSION) - -localcopy: - tar c $(FILES) | tar x -C $(PACKAGE)-$(VERSION) - -tar: - tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION) - bzip2 -9vf $(PACKAGE)-$(VERSION).tar - rm -rf $(PACKAGE)-$(VERSION) - -buildrpm: - rpm -ta $(PACKAGE)-$(VERSION).tar.bz2 +dis: + rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar* + svn export -q -rBASE . $(NAME)-$(VERSION) + find $(NAME)-$(VERSION) -name .cvsignore |xargs rm -rf + tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION) + bzip2 -9f ../$(NAME)-$(VERSION).tar + rm -rf $(NAME)-$(VERSION) diff --git a/monitor-edid.spec b/monitor-edid.spec deleted file mode 100644 index d8a702f..0000000 --- a/monitor-edid.spec +++ /dev/null @@ -1,96 +0,0 @@ -# EDIT IN SVN NOT IN SOURCE PACKAGE (NO PATCH ALLOWED). - -%define name monitor-edid -%define version 1.11 -%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 -monitor. - -%prep -%setup -q - -%build -%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 - -ln -s monitor-edid $RPM_BUILD_ROOT%{_sbindir}/monitor-get-edid - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc README -%{_bindir}/* -%{_sbindir}/* - -%changelog -* Thu Aug 31 2006 Gwenole Beauchesne 1.11-1mdv2007.0 -- fix ballback to old get_edid() function -- ignore VBIOS checksum failures, use CPU emulator in that case - -* Tue Jul 11 2006 Pixel 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 1.9-5mdv2007.0 -- do not build on sparc -- build with $RPM_OPT_FLAGS -- do parallell build -- cosmetics - -* Wed May 10 2006 Pixel 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 1.9-3mdk -- set url to wiki page instead of the cvs - -* Fri Jan 6 2006 Pixel 1.9-2mdk -- add missing monitor-get-edid - -* Thu Jan 5 2006 Pixel 1.9-1mdk -- monitor-get-edid is now a perl script able to probe /proc/acpi/video - (or /proc/device-tree on PPC) -- binary monitor-get-edid is now monitor-get-edid-using-vbe -- monitor-edid is able to get more than one head - -* Mon Aug 8 2005 Pixel 1.5-1mdk -- add option --try-in-console when probing edid - since probing edid sometimes only work in console -- use this option by default in monitor-probe - -* Wed Apr 6 2005 Pixel 1.4-1mdk -- default on old lrmi code to get ddc via int10 -- fix build on vesa-cvt - -* Fri Mar 25 2005 Pixel 1.3-1mdk -- added vesa-cvt (allowing to compute reduced-blanking timings) - -* Thu Mar 17 2005 Pixel 1.2-1mdk -- new release (added monitor-probe and monitor-probe-using-X) - -* Tue Mar 8 2005 Pixel 1.1-1mdk -- new release - -* Wed Feb 23 2005 Pixel 1.0-1mdk -- first package -- cgit v1.2.1