rpms/xcalib/F-8 xcalib-0.8-cflags.patch, NONE, 1.1 xcalib-repack.sh, NONE, 1.1 xcalib.spec, NONE, 1.1 sources, 1.1, 1.2

[Chauvet (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/xcalib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21247

Modified Files:
	sources 
Added Files:
	xcalib-0.8-cflags.patch xcalib-repack.sh xcalib.spec 
Log Message:
Import for F-8


xcalib-0.8-cflags.patch:

--- NEW FILE xcalib-0.8-cflags.patch ---
diff -up xcalib-0.8/Makefile.cflags xcalib-0.8/Makefile
--- xcalib-0.8/Makefile.cflags	2007-08-26 23:30:34.000000000 +0200
+++ xcalib-0.8/Makefile	2007-09-07 17:00:13.000000000 +0200
@@ -36,12 +36,12 @@
 # to change the following variables
 
 XCALIB_VERSION = 0.8
-CFLAGS = -O2
-XINCLUDEDIR = /usr/X11R6/include
-XLIBDIR = /usr/X11R6/lib
+#CFLAGS = -O2
+#XINCLUDEDIR = /usr/X11R6/include
+#XLIBDIR = /usr/X11R6/lib
 # for ATI's proprietary driver (must contain the header file fglrx_gamma.h)
-FGLRXINCLUDEDIR = ./fglrx
-FGLRXLIBDIR = ./fglrx
+#FGLRXINCLUDEDIR = ./fglrx
+#FGLRXLIBDIR = ./fglrx
 
 # default make target
 all: xcalib
@@ -56,14 +56,15 @@ fglrx_xcalib: xcalib.c
 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX
 	$(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma
 
-win_xcalib: xcalib.c
-	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
-	windres.exe resource.rc resource.o
-	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
+#win_xcalib: xcalib.c
+#	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
+#	windres.exe resource.rc resource.o
+#	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
 
 install:
-	cp ./xcalib $(DESTDIR)/usr/local/bin/
-	chmod 0644 $(DESTDIR)/usr/local/bin/xcalib
+	mkdir -p $(DESTDIR)/usr/bin/
+	cp ./xcalib $(DESTDIR)/usr/bin/
+	chmod 0755 $(DESTDIR)/usr/bin/xcalib
 
 clean:
 	rm -f xcalib.o


--- NEW FILE xcalib-repack.sh ---
#!/bin/bash

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
ver=0.8

cd "$tmp"
wget -N http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/xcalib-source-${ver}.tar.gz
tar zxvf xcalib-source-${ver}.tar.gz
pushd xcalib-${ver}
rm -rf fglrx/
rm -rf *.{icc,icm}
popd
tar jcf "$pwd"/xcalib-repack-${ver}.tar.bz2 xcalib-${ver}
cd - >/dev/null


--- NEW FILE xcalib.spec ---
Name:           xcalib
Version:        0.8
Release:        4%{?dist}
Summary:        Tiny monitor calibration loader for X.org

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
# Sources from http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/xcalib-source-%{version}.tar.gz
Source0:        http://kwizart.fedorapeople.org/SOURCES/xcalib-repack-%{version}.tar.bz2
Source10:       xcalib-repack.sh
Patch0:         xcalib-0.8-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-proto-devel
BuildRequires:  libXxf86vm-devel
BuildRequires:  libX11-devel
BuildRequires:  libXext-devel


%description
Tiny monitor calibration loader for X.org


%prep
%setup -q
%patch0 -p1 -b .cflags

# Convert file-not-utf8
iconv -f iso8859-1 -t utf8 README > README-utf8 
touch -r README README-utf8 
mv README-utf8 README

%build
export CFLAGS="$RPM_OPT_FLAGS"
export XINCLUDEDIR=%{_includedir}
export XLIBDIR=%{_libdir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README README.profilers
%{_bindir}/*


%changelog
* Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.8-4
- Repackage the sources.

* Thu Feb 14 2008 kwizart < kwizart at gmail.com > - 0.8-3
- Drop icc profiles (unneeded)
- Fix file-not-utf8 README

* Sat Feb  2 2008 kwizart < kwizart at gmail.com > - 0.8-2
- Uses color-filesystem BR and macros

* Fri Sep  7 2007 kwizart < kwizart at gmail.com > - 0.8-1
- Update to 0.8

* Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.6-1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcalib/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Feb 2008 18:47:25 -0000	1.1
+++ sources	28 Feb 2008 02:33:39 -0000	1.2
@@ -0,0 +1 @@
+0b5298a6e433ed45d7bd35405ee4441a  xcalib-repack-0.8.tar.bz2