Hello community, here is the log from the commit of package xcm for openSUSE:Factory checked in at 2014-05-15 19:19:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcm (Old) and /work/SRC/openSUSE:Factory/.xcm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcm" Changes: -------- --- /work/SRC/openSUSE:Factory/xcm/xcm.changes 2013-02-05 11:21:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xcm.new/xcm.changes 2014-05-15 19:19:31.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 10 12:00:00 UTC 2014 - [email protected] + +- official release 0.5.3 +- fix handle of x,y,width and height args +- fix window listing in xcm -l +- reduce library dependencies for some binaries +- add _udevrulesdir in spec file + +------------------------------------------------------------------- Old: ---- xcm-0.5.2.tar.bz2 New: ---- xcm-0.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcm.spec ++++++ --- /var/tmp/diff_new_pack.6Emk2o/_old 2014-05-15 19:19:32.000000000 +0200 +++ /var/tmp/diff_new_pack.6Emk2o/_new 2014-05-15 19:19:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ %define _udevrulesdir /lib/udev/rules.d %endif -Version: 0.5.2 +Version: 0.5.3 Release: 0 -Source: http://sourceforge.net/projects/oyranos/files/Xcm/xcm-0.5.2.tar.bz2 +Source: http://sourceforge.net/projects/oyranos/files/Xcm/xcm-%{version}.tar.bz2 Summary: X Color Management tools License: MIT Group: System/X11/Utilities @@ -34,7 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: udev -Requires: liboyranos0 >= 0.9.3 +Requires: liboyranos0 >= 0.9.5 %if 0%{?suse_version} > 0 BuildRequires: gcc-c++ @@ -43,14 +43,12 @@ BuildRequires: xorg-x11-Mesa BuildRequires: xorg-x11-Mesa-devel %endif -%if 0%{?suse_version} > 910 -%endif %if 0%{?suse_version} > 1010 BuildRequires: Mesa BuildRequires: Mesa-devel BuildRequires: gcc-c++ BuildRequires: libXcm-devel -BuildRequires: liboyranos-devel >= 0.9.3 +BuildRequires: liboyranos-devel >= 0.9.5 BuildRequires: pkgconfig BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel @@ -66,7 +64,7 @@ BuildRequires: Mesa BuildRequires: gcc-c++ BuildRequires: libXcm-devel -BuildRequires: liboyranos-devel >= 0.9.3 +BuildRequires: liboyranos-devel >= 0.9.5 BuildRequires: libtool-devel BuildRequires: mesagl-devel BuildRequires: pkgconfig @@ -79,7 +77,7 @@ BuildRequires: libXcm-devel BuildRequires: libXfixes-devel BuildRequires: libXmu-devel -BuildRequires: liboyranos-devel >= 0.9.3 +BuildRequires: liboyranos-devel >= 0.9.5 BuildRequires: libtool-ltdl-devel BuildRequires: xdg-utils BuildRequires: xorg-x11-Mesa-devel ++++++ xcm-0.5.2.tar.bz2 -> xcm-0.5.3.tar.bz2 ++++++ ++++ 11623 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/configure.ac new/xcm-0.5.3/configure.ac --- old/xcm-0.5.2/configure.ac 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/configure.ac 2013-04-24 11:34:59.000000000 +0200 @@ -1,6 +1,6 @@ define([MAJOR],[0]) define([MINOR],[5]) -define([MICRO],[2]) +define([MICRO],[3]) AC_INIT([xcm], [MAJOR.MINOR.MICRO], https://sourceforge.net/tracker/?group_id=177017&atid=879553, xcm, @@ -92,6 +92,9 @@ PKG_CHECK_EXISTS([xcm], [ PKG_CHECK_MODULES([libXcm], [xcm]) + PKG_CHECK_MODULES([libXcmEDID], [xcm-edid]) + PKG_CHECK_MODULES([libXcmDDC], [xcm-ddc]) + PKG_CHECK_MODULES([libXcmX11], [xcm-x11]) AM_CONDITIONAL([HAVE_XCM], [true]) HAVE_XCM="#define XCM_HAVE_XCM 1" ], [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/man/xcm.1 new/xcm-0.5.3/man/xcm.1 --- old/xcm-0.5.2/man/xcm.1 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/man/xcm.1 2013-01-13 19:40:38.000000000 +0100 @@ -35,7 +35,7 @@ \fB--profile\fR the region profile to upload. .TP \fB\-d \fB--id\fR \fIWINDOW_ID\fR \fB--geometry\fR \fIWxH+X+Y\fR \fB--profile\fR \fIPROFILE.ICC\fR -delete a window color region. The geometry will be searched and removed in the existing regions of the selected window. +release a window color region. The geometry will be searched and removed in the existing regions of the selected window. \fB--id\fR the X11 window ID as integer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/src/Makefile.am new/xcm-0.5.3/src/Makefile.am --- old/xcm-0.5.2/src/Makefile.am 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/src/Makefile.am 2013-04-24 10:54:02.000000000 +0200 @@ -7,19 +7,19 @@ bin_PROGRAMS = xcmedid xcmedid_SOURCES = xcmedid.c -xcmedid_LDADD = ${libXcm_LIBS} -lm +xcmedid_LDADD = ${libXcmEDID_LIBS} -lm if HAVE_LINUX bin_PROGRAMS += xcmddc xcmddc_SOURCES = xcmddc.c -xcmddc_LDADD = ${libXcm_LIBS} -lm +xcmddc_LDADD = ${libXcmDDC_LIBS} -lm endif if HAVE_X11 bin_PROGRAMS += xcm xcmevents xcm_SOURCES = xcm.c -xcm_LDADD = ${libXcm_LIBS} ${libX11_LIBS} ${libXfixes_LIBS} \ +xcm_LDADD = ${libXcmX11_LIBS} ${libX11_LIBS} ${libXfixes_LIBS} \ ${libXmu_LIBS} $(liboyranos_LIBS) -lm xcmevents_SOURCES = xcmevents.c -xcmevents_LDADD = ${libXcm_LIBS} ${libX11_LIBS} ${libXfixes_LIBS} \ +xcmevents_LDADD = ${libXcmX11_LIBS} ${libX11_LIBS} ${libXfixes_LIBS} \ ${libXmu_LIBS} $(liboyranos_LIBS) -lm endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/src/xcm.c new/xcm-0.5.3/src/xcm.c --- old/xcm-0.5.2/src/xcm.c 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/src/xcm.c 2013-02-06 13:01:41.000000000 +0100 @@ -6,7 +6,7 @@ * @par License: * MIT <http://www.opensource.org/licenses/mit-license.php> * @par Copyright: - * (c) 2011 - Kai-Uwe Behrmann <[email protected]> + * (c) 2011-2013 Kai-Uwe Behrmann <[email protected]> * * gcc -Wall -g -I../.. xcm.c -o xcm `pkg-config --cflags --libs x11 xcm oyranos` */ @@ -15,11 +15,13 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> /* sleep() */ +#include <arpa/inet.h> /* ntohl() */ #include <X11/Xcm/Xcm.h> #include <X11/Xcm/XcmEvents.h> #include <X11/extensions/Xfixes.h> /* XserverRegion */ #include <X11/Xcm/Xcm.h> /* XcolorRegion */ +#include <X11/Xutil.h> /* NormalState */ #include "config.h" #include "xcm_version.h" @@ -28,6 +30,8 @@ #define OY_DBG_ARGS_ __FILE__,__LINE__,strrchr(__func__,'/')?strrchr(__func__,'/')+1:__func__ int XcolorRegionFind(XcolorRegion * old_regions, unsigned long old_regions_n, Display * dpy, Window win, XRectangle * rectangle); +void TraverseXTree( Display * dpy, Window win, Window root, + int print_window_name, int level); void printfHelp(int argc, char ** argv) { @@ -51,7 +55,7 @@ " --geometry width_x_height_+_x_+_y]\n"); fprintf( stderr, " --id=window_id [--profile filename.icc]\n"); fprintf( stderr, "\n"); - fprintf( stderr, " %s\n", _("Delete window region:")); + fprintf( stderr, " %s\n", _("Release window region:")); fprintf( stderr, " %s -d\n",argv[0]); fprintf( stderr, " [-x pos_x -y pos_y --width width --height height|\n" " --geometry width_x_height_+_x_+_y]\n"); @@ -74,7 +78,6 @@ int print = 0; int print_window_name = 0; int list_windows = 0; - int count = 0; const char * display = NULL; const char * geometry = NULL; @@ -84,7 +87,7 @@ root; int place_region = 0; - int delete_region = 0; + int release_region = 0; int x = 0, y = 0, width = 0, height = 0; const char * profile_name = NULL; int verbose = 0; @@ -118,7 +121,7 @@ for(i = 1; pos < argc && i < strlen(argv[pos]); ++i) switch (argv[pos][i]) { - case 'd': delete_region = 1; break; + case 'd': release_region = 1; break; case 'l': list_windows = 1; break; case 'p': print = 1; break; case 'r': place_region = 1; break; @@ -191,71 +194,24 @@ _("argument not recognised"), geometry); exit(1); } - - rec[0].x = x; - rec[0].y = y; - rec[0].width = width; - rec[0].height = height; } + /* copy geometry taken by --geometry or othe rarguments */ + rec[0].x = x; + rec[0].y = y; + rec[0].width = width; + rec[0].height = height; + win = (Window) id; screen = DefaultScreen( dpy ); root = XRootWindow( dpy, screen ); if(list_windows) { - Status status = 0; if(!verbose) { - { - Window root_return = 0, - parent_return = 0, - * children_return = 0, - * wins = 0; - unsigned int nchildren_return = 0, wins_n = 0; - int i; - XWindowAttributes window_attributes_return; - - XSync( dpy, 0 ); - status = XQueryTree( dpy, root, - &root_return, &parent_return, - &children_return, &nchildren_return ); - if(status == 0) fprintf( stderr, "%d: XQueryTree failed\n", __LINE__ ); - - wins = (Window*)malloc(sizeof(Window) * nchildren_return ); - memcpy( wins, children_return, sizeof(Window) * nchildren_return ); - XFree( children_return ); - children_return = wins; wins = 0; - - for(i = nchildren_return - 1; i >= 0; --i) - { - root_return = 0; - status = XQueryTree( dpy, children_return[i], - &root_return, &parent_return, - &wins, &wins_n ); - if(status == 0)fprintf( stderr, "%d: XQueryTree failed\n", __LINE__ ); - status = XGetWindowAttributes( dpy, children_return[i], - &window_attributes_return ); - if(status == 0)fprintf( stderr, "%d: XQueryTree failed\n", __LINE__ ); - if(window_attributes_return.map_state == IsViewable && - parent_return == root) - { - if(verbose) - fprintf( stdout, "%s", - XcmePrintWindowRegions( dpy, children_return[i], 0 )); - fprintf( stdout, "%d", (int)children_return[i] ); - if(print_window_name) - fprintf( stdout, " %s", - XcmePrintWindowName(dpy, children_return[i]) ); - fprintf( stdout, "\n" ); - ++count; - } - - XFree( wins ); - } - - free( children_return ); - } + XSync( dpy, 0 ); + TraverseXTree( dpy, root, root, print_window_name, 0 ); } else { XcmeContext_s * c = XcmeContext_Create( display ); @@ -329,11 +285,11 @@ if(nRegions && r) { error = XcolorRegionDelete( dpy, win, 0, nRegions ); - fprintf(stderr, "deleted %lu region%c\n", nRegions, nRegions==1?' ':'s'); + fprintf(stderr, "released %lu region%c\n", nRegions, nRegions==1?' ':'s'); XFree( r ); r = 0; } else { - fprintf(stderr, "no region to delete \n"); + fprintf(stderr, "no region to release \n"); } } @@ -344,7 +300,7 @@ if(need_wait) while(1) sleep(2); - } if(delete_region) + } if(release_region) { XcolorRegion *old_regions = 0; unsigned long old_regions_n = 0; @@ -357,10 +313,10 @@ XFree( old_regions ); if(pos >= 0) { - int undeleted_n = old_regions_n; + int unreleased_n = old_regions_n; XcolorRegionDelete( dpy, win, pos, 1 ); old_regions = XcolorRegionFetch( dpy, win, &old_regions_n ); - if(undeleted_n - old_regions_n != 1) + if(unreleased_n - old_regions_n != 1) printf( OY_DBG_FORMAT_"removed %d; have still %d\n", OY_DBG_ARGS_, pos, (int)old_regions_n ); else @@ -422,7 +378,67 @@ return pos; } +void TraverseXTree( Display * dpy, Window win, Window root, + int print_window_name, int level) +{ + Window root_return = 0, + parent_return = 0, + * wins = 0; + unsigned int wins_n = 0; + int i; + XWindowAttributes window_attributes_return; + Status status = 0; + + Atom atom_wm_state; + Atom atom_type = None; + int format; + unsigned long nitems = 0, after; + unsigned char *data = NULL; + Window inf; + + unsigned long nRegions = 0; + XcolorRegion * r = XcolorRegionFetch( dpy, win, &nRegions ); + + status = XQueryTree( dpy, win, + &root_return, &parent_return, + &wins, &wins_n ); + if(status == 0) fprintf( stderr, "%d: XQueryTree failed\n", __LINE__ ); + status = XGetWindowAttributes( dpy, win, + &window_attributes_return ); + if(status == 0) fprintf( stderr,"%d: XGetWindowAttributes failed\n",__LINE__); + + atom_wm_state = XInternAtom(dpy, "WM_STATE", True); + if(atom_wm_state) + XGetWindowProperty(dpy, win, atom_wm_state, 0, 2L, False, AnyPropertyType, + &atom_type, &format, &nitems, &after, &data); + + if(window_attributes_return.map_state == IsViewable && + root_return == root && nitems && (*(uint32_t*)data) == NormalState) + { + int j; + for(j = 0; j < level; ++j) + fprintf( stdout, " " ); + fprintf( stdout, "%d", (int)win ); + if(print_window_name) + { + fprintf( stdout, " %s", + XcmePrintWindowName(dpy, win) ); + if(nRegions) + fprintf( stdout, " %lu", nRegions ); + } + fprintf( stdout, "\n" ); + } + for(i = 0; i < wins_n; ++i) + TraverseXTree( dpy, wins[i], root, print_window_name, level+1 ); + + if(wins) + XFree( wins ); + if(data) + XFree( data ); + if(r) + XFree( r ); +} #ifdef XCM_HAVE_OY void * fromMD5 ( const void * md5_hash, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/src/xcmddc.c new/xcm-0.5.3/src/xcmddc.c --- old/xcm-0.5.2/src/xcmddc.c 2012-11-05 14:54:39.000000000 +0100 +++ new/xcm-0.5.3/src/xcmddc.c 2013-02-05 07:56:19.000000000 +0100 @@ -5,7 +5,7 @@ * @par License: * MIT <http://www.opensource.org/licenses/mit-license.php> * @par Copyright: - * (c) 2010 - Kai-Uwe Behrmann <[email protected]> + * (c) 2010-2012 Kai-Uwe Behrmann <[email protected]> * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/src/xcmedid.c new/xcm-0.5.3/src/xcmedid.c --- old/xcm-0.5.2/src/xcmedid.c 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/src/xcmedid.c 2013-02-05 07:56:30.000000000 +0100 @@ -5,7 +5,7 @@ * @par License: * MIT <http://www.opensource.org/licenses/mit-license.php> * @par Copyright: - * (c) 2009-2011 - Kai-Uwe Behrmann <[email protected]> + * (c) 2009-2012 - Kai-Uwe Behrmann <[email protected]> * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/src/xcmevents.c new/xcm-0.5.3/src/xcmevents.c --- old/xcm-0.5.2/src/xcmevents.c 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/src/xcmevents.c 2013-02-05 07:57:28.000000000 +0100 @@ -5,7 +5,7 @@ * @par License: * MIT <http://www.opensource.org/licenses/mit-license.php> * @par Copyright: - * (c) 2009-2010 - Kai-Uwe Behrmann <[email protected]> + * (c) 2009-2012 - Kai-Uwe Behrmann <[email protected]> * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/xcm.spec.in new/xcm-0.5.3/xcm.spec.in --- old/xcm-0.5.2/xcm.spec.in 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/xcm.spec.in 2013-04-25 12:31:18.000000000 +0200 @@ -1,36 +1,72 @@ +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevrulesdir /usr/lib/udev/rules.d +%else +%define _udevrulesdir /lib/udev/rules.d +%endif + Version: @PACKAGE_VERSION@ Release: 0 Source: http://sourceforge.net/projects/oyranos/files/Xcm/xcm-@[email protected] Summary: X Color Management tools -Name: xcm License: MIT Group: System/X11/Utilities + +Name: xcm URL: http://www.oyranos.org Vendor: Kai-Uwe Behrmann BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: %{_prefix} BuildRequires: udev %if 0%{?suse_version} > 0 -BuildRequires: gcc-c++ pkgconfig xorg-x11-Mesa xorg-x11-Mesa-devel -%endif -%if 0%{?suse_version} > 910 -BuildRequires: bash bind-utils binutils bison bzip2 coreutils cpio cyrus-sasl diffutils e2fsprogs file filesystem findutils gcc gcc-c++ glibc glibc-devel grep groff gzip less libtool make man mktemp patch perl pkgconfig popt readline rpm sed tar timezone unzip util-linux zlib zlib-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: xorg-x11-Mesa +BuildRequires: xorg-x11-Mesa-devel %endif %if 0%{?suse_version} > 1010 -BuildRequires: Mesa Mesa-devel gcc-c++ pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libX11 xorg-x11-libX11-devel xorg-x11-libXfixes xorg-x11-libXfixes-devel xorg-x11-libs xorg-x11-util-devel xorg-x11-libXmu-devel libXcm-devel liboyranos-alpha-devel +BuildRequires: Mesa +BuildRequires: Mesa-devel +BuildRequires: gcc-c++ +BuildRequires: libXcm-devel +BuildRequires: liboyranos-devel >= 0.9.3 +BuildRequires: pkgconfig +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libX11 +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXfixes +BuildRequires: xorg-x11-libXfixes-devel +BuildRequires: xorg-x11-libXmu-devel +BuildRequires: xorg-x11-libs +BuildRequires: xorg-x11-util-devel %endif %if 0%{?mandriva_version} > 0 -BuildRequires: Mesa mesagl-devel gcc-c++ pkgconfig libXcm-devel liboyranos-alpha-devel libtool-devel +BuildRequires: Mesa +BuildRequires: gcc-c++ +BuildRequires: libXcm-devel +BuildRequires: liboyranos-devel >= 0.9.3 +BuildRequires: libtool-devel +BuildRequires: mesagl-devel +BuildRequires: pkgconfig %endif %if 0%{?fedora_version} > 0 -BuildRequires: Mesa Mesa-devel gcc-c++ xorg-x11-devel xorg-x11-Mesa-devel xdg-utils libXfixes-devel xorg-x11-proto-devel xorg-x11-xtrans-devel libXcm-devel liboyranos-alpha-devel libXmu-devel elektra-devel libtool-ltdl-devel +BuildRequires: Mesa +BuildRequires: Mesa-devel +BuildRequires: elektra-devel +BuildRequires: gcc-c++ +BuildRequires: libXcm-devel +BuildRequires: libXfixes-devel +BuildRequires: libXmu-devel +BuildRequires: liboyranos-devel >= 0.9.3 +BuildRequires: libtool-ltdl-devel +BuildRequires: xdg-utils +BuildRequires: xorg-x11-Mesa-devel +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-xtrans-devel %endif -%if 0%{?debian_version} > 0 -BuildRequires: gcc-c++ pkgconfig xorg-x11 xorg-x11-devel xorg-x11-Mesa-devel xdg-utils liboyranos-alpha-devel -%endif - %description The Xcm tools are colour management helpers for Xorg. @@ -42,7 +78,7 @@ %setup -n %{name}-%{version} %build -%configure --disable-static +%configure --disable-static --with-udev-dir=%{_udevrulesdir} make %{?_smp_mflags} %install @@ -62,7 +98,7 @@ %{_mandir}/man1/%{name}ddc.1* %{_mandir}/man1/%{name}edid.1* %{_mandir}/man1/%{name}events.1* -/lib/udev/rules.d/90-xcm-i2c.rules +%{_udevrulesdir}/90-xcm-i2c.rules %doc AUTHORS COPYING ChangeLog README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/xcm_macros.h new/xcm-0.5.3/xcm_macros.h --- old/xcm-0.5.2/xcm_macros.h 2013-01-04 20:41:48.000000000 +0100 +++ new/xcm-0.5.3/xcm_macros.h 2013-02-05 07:55:14.000000000 +0100 @@ -3,7 +3,7 @@ * @par License: * MIT <http://www.opensource.org/licenses/mit-license.php> * @par Copyright: - * (c) 2011 - Kai-Uwe Behrmann <[email protected]> + * (c) 2011-2013 Kai-Uwe Behrmann <[email protected]> */ #ifndef USE_GETTEXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.2/xcm_version.h.in new/xcm-0.5.3/xcm_version.h.in --- old/xcm-0.5.2/xcm_version.h.in 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.3/xcm_version.h.in 2013-04-24 10:25:41.000000000 +0200 @@ -6,11 +6,4 @@ @HAVE_LINUX@ @HAVE_OY@ -#define XCM_VERSION_MAJOR @XCM_PACKAGE_MAJOR@ -#define XCM_VERSION_MINOR @XCM_PACKAGE_MINOR@ -#define XCM_VERSION_MICRO @XCM_PACKAGE_MICRO@ -#define XCM_VERSION @PACKAGE_VERSION@ -#define XCM_VERSION_NUM (@XCM_PACKAGE_MAJOR@*10000+@XCM_PACKAGE_MINOR@*100+@XCM_PACKAGE_MICRO@) -#define XCM_LIB_VERSION @LIBTOOL_VERSION@ - #endif /*XCM_TOOLS_VERSION_H*/ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
