diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8b78aa1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xcalib-repack-0.8.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 315bea0..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -dead upstream diff --git a/sources b/sources new file mode 100644 index 0000000..c2353e4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +0b5298a6e433ed45d7bd35405ee4441a xcalib-repack-0.8.tar.bz2 diff --git a/xcalib-0.8-cflags.patch b/xcalib-0.8-cflags.patch new file mode 100644 index 0000000..7a3d04b --- /dev/null +++ b/xcalib-0.8-cflags.patch @@ -0,0 +1,43 @@ +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 diff --git a/xcalib-0.8-rhbz783562.patch b/xcalib-0.8-rhbz783562.patch new file mode 100644 index 0000000..6c489f3 --- /dev/null +++ b/xcalib-0.8-rhbz783562.patch @@ -0,0 +1,18 @@ +--- a/xcalib-0.8/xcalib.c 2007-08-26 17:54:34.000000000 -0400 ++++ a/xcalib-0.8/xcalib.c 2012-10-10 12:10:37.249771179 -0400 +@@ -150,12 +150,12 @@ usage (void) + "last parameter must be an ICC profile containing a vcgt-tag\n"); + fprintf (stdout, "\n"); + #ifndef WIN32GDI +- fprintf (stdout, "Example: ./xcalib -d :0 -s 0 -v bluish.icc\n"); ++ fprintf (stdout, "Example: xcalib -d :0 -s 0 -v bluish.icc\n"); + #else +- fprintf (stdout, "Example: ./xcalib -v bluish.icc\n"); ++ fprintf (stdout, "Example: xcalib -v bluish.icc\n"); + #endif + #ifndef FGLRX +- fprintf (stdout, "Example: ./xcalib -red 1.1 10.0 100.0\n"); ++ fprintf (stdout, "Example: xcalib -red 1.1 10.0 100.0 -a\n"); + #endif + fprintf (stdout, "\n"); + exit (0); diff --git a/xcalib-repack.sh b/xcalib-repack.sh new file mode 100755 index 0000000..3d805c8 --- /dev/null +++ b/xcalib-repack.sh @@ -0,0 +1,25 @@ +#!/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 diff --git a/xcalib.spec b/xcalib.spec new file mode 100644 index 0000000..ca8d9de --- /dev/null +++ b/xcalib.spec @@ -0,0 +1,149 @@ +Name: xcalib +Version: 0.8 +Release: 30%{?dist} +Summary: Tiny monitor calibration loader for X.org + +License: GPLv2+ +URL: http://xcalib.sourceforge.net/ +# Sources from http://downloads.sourceforge.net/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 +Patch1: xcalib-0.8-rhbz783562.patch + +BuildRequires: make +BuildRequires: gcc + +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 +%patch1 -p2 -b .rhbz783562 + +# 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_build + + +%install +%make_install + + + + +%files +%doc README README.profilers +%license COPYING +%{_bindir}/* + + +%changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.8-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.8-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.8-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.8-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.8-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.8-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.8-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.8-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 17 2018 Nicolas Chauvet - 0.8-22 +- Refresh spec file + +* Sat Jul 14 2018 Fedora Release Engineering - 0.8-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.8-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.8-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.8-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.8-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0.8-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.8-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 0.8-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Jan 26 2013 Nicolas Chauvet - 0.8-11 +- Fix rhbz#783562 + +* Sun Jul 22 2012 Fedora Release Engineering - 0.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jul 27 2009 Fedora Release Engineering - 0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Oct 15 2008 kwizart < kwizart at gmail.com > - 0.8-5 +- Rebuild + +* 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