- New upstream release

- remove BuildRoot from spec
- add subpackages for libxdo
- ship manpage
- bump Epoch as upstream changed the versioning
- use make install (with a makefile-patch) instead of manual install in
    spec

.cvsignore

@@ -1 +1 @@
-xdotool-20090815.tar.gz
+xdotool-0.20100118.2605.tar.gz

sources

@@ -1 +1 @@
-32b1127c0c24f5b3d0a1a1c09b3d44f8  xdotool-20090815.tar.gz
+9e0afbe66771dc0f90eb778728a4fbc9  xdotool-0.20100118.2605.tar.gz

xdotool-makefile.patch

@@ -0,0 +1,24 @@
+--- Makefile.orig	2010-02-06 02:17:45.428793838 +0100
++++ Makefile	2010-02-06 02:19:28.420793962 +0100
+@@ -29,17 +29,20 @@
+ install: installlib installprog installman installheader
+ 
+ installprog: xdotool
++	[ -d $(INSTALLBIN) ] || mkdir -p $(INSTALLBIN)
+ 	install -m 755 xdotool $(INSTALLBIN)/
+ 
+ installlib: libxdo.so
++	[ -d $(INSTALLLIB) ] || mkdir -p $(INSTALLLIB)
+ 	install libxdo.so $(INSTALLLIB)/libxdo.so.$(MAJOR)
+ 	ln -sf libxdo.so.$(MAJOR) $(INSTALLLIB)/libxdo.so
+ 
+ installheader: xdo.h
++	[ -d $(INSTALLINCLUDE) ] || mkdir -p $(INSTALLINCLUDE)
+ 	install xdo.h $(INSTALLINCLUDE)/xdo.h
+ 
+ installman: xdotool.1
+-	[ -d $(INSTALLMAN) ] || mkdir $(INSTALLMAN)
++	[ -d $(INSTALLMAN) ] || mkdir -p $(INSTALLMAN)
+ 	[ -d $(INSTALLMAN)/man1 ] || mkdir $(INSTALLMAN)/man1
+ 	install -m 644 xdotool.1 $(INSTALLMAN)/man1/
+ 

xdotool.spec

@@ -1,22 +1,41 @@
 Name:           xdotool
-Version:        20090815
+Version:        0.20100118.2605
+Epoch:          1
 Release:        1%{?dist}
 Summary:        Fake keyboard/mouse input
-
 Group:          User Interface/X
 License:        BSD
 URL:            http://www.semicomplete.com/projects/xdotool/
-Source0:        http://www.semicomplete.com/files/xdotool/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://semicomplete.googlecode.com/files/%{name}-%{version}.tar.gz
+# Create directories if they don't exist
+# http://code.google.com/p/semicomplete/issues/detail?id=17
+Patch0:         xdotool-makefile.patch
 
 BuildRequires:  libXtst-devel, libX11-devel
 
 %description
-This tool lets you programatically (or manually) simulate keyboard input
-and mouse activity, move and resize windows, etc.
+This tool lets you programmatically (or manually) simulate keyboard input
+and mouse activity, move and re-size windows, etc.
+
+%package -n libxdo
+Group: System Environment/Libraries
+Summary: Keyboard input simulation library
+                                                                                                                                                                                  
+%description -n libxdo
+This library contains functions to simulate keyboard and mouse input
+
+%package -n libxdo-devel
+Summary:        Development files for libxdo
+Group:          Development/Libraries
+Requires:       libxdo = %{version}-%{release}
+
+%description -n libxdo-devel
+The libxdo-devel package contains libraries and header files for
+developing applications that use libxdo
 
 %prep
 %setup -q
+%patch0
 
 %build
 export WARNFLAGS="$RPM_OPT_FLAGS"
@@ -25,8 +44,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#manual install
-install -D -m 0755 xdotool $RPM_BUILD_ROOT%{_bindir}/xdotool
+make PREFIX=$RPM_BUILD_ROOT/%{_prefix} INSTALLMAN=$RPM_BUILD_ROOT%{_mandir} INSTALLLIB=$RPM_BUILD_ROOT%{_libdir} install
 
 #fix permissions
 chmod 0644 examples/ffsp.sh
@@ -34,15 +52,35 @@ chmod 0644 examples/ffsp.sh
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n libxdo -p /sbin/ldconfig
 
-%files
+%postun -n libxdo -p /sbin/ldconfig
+
+%files -n libxdo
 %defattr(-,root,root,-)
 %doc CHANGELIST COPYRIGHT README
-%doc examples
-%{_bindir}/*
+%{_libdir}/*.so.*
 
+%files -n libxdo-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/*.so
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%doc examples
 
 %changelog
+* Tue Feb 05 2010 Sven Lankes <sven@lank.es> - 0.20100118.2605-1
+- New upstream release
+- remove BuildRoot from spec
+- add subpackages for libxdo
+- ship manpage
+- bump Epoch as upstream changed the versioning
+- use make install (with a makefile-patch) instead of manual install in spec
+
 * Thu Sep 17 2009 Sven Lankes <sven@lank.es> - 20090815-1
 - New upstream release (fixes #521765)