rpms/podsleuth/F-12 podsleuth-0.6.6-libdir.patch, NONE, 1.1 podsleuth-make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.6, 1.7 podsleuth.spec, 1.14, 1.15 sources, 1.6, 1.7

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15566

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.6-libdir.patch podsleuth-make-git-snapshot.sh 
Log Message:
* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.6-0.1.20091216git
- Update to git snapshot (20091216) for DeviceKit-disks integration
  (BZ 495240)
- Update libdir patch
- Use upstream's dbus policy file


podsleuth-0.6.6-libdir.patch:
 PodSleuth.Hal/Makefile.am      |    2 +-
 PodSleuth.Hal/hal-podsleuth.in |    2 +-
 PodSleuth.Hal/podsleuth.in     |    2 +-
 PodSleuth/Makefile.am          |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE podsleuth-0.6.6-libdir.patch ---
diff -uNr podsleuth-20091216.old/src/PodSleuth/Makefile.am podsleuth-20091216/src/PodSleuth/Makefile.am
--- podsleuth-20091216.old/src/PodSleuth/Makefile.am	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth/Makefile.am	2009-12-16 20:19:21.000000000 +0100
@@ -9,7 +9,7 @@
 ASSEMBLY_REF = -r:System.Xml -r:Mono.Posix
 ASSEMBLY_RES = data/ipod-model-table
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 sleuth_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
 
 ASSEMBLY_EXPANDED_RES = $(foreach res,$(ASSEMBLY_RES), $(top_srcdir)/$(res))
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/hal-podsleuth.in podsleuth-20091216/src/PodSleuth.Hal/hal-podsleuth.in
--- podsleuth-20091216.old/src/PodSleuth.Hal/hal-podsleuth.in	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/hal-podsleuth.in	2009-12-16 20:18:35.000000000 +0100
@@ -2,7 +2,7 @@
 
 MONO=mono
 MONO_ARGS="--debug"
-MONO_EXEC="@prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe"
+MONO_EXEC="@libdir@/@PACKAGE@/PodSleuth.Hal.exe"
 
 if [ "$1" = "--update" ]; then
 	MONO_EXEC_ARGS="--update"
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/Makefile.am podsleuth-20091216/src/PodSleuth.Hal/Makefile.am
--- podsleuth-20091216.old/src/PodSleuth.Hal/Makefile.am	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/Makefile.am	2009-12-16 20:19:03.000000000 +0100
@@ -11,7 +11,7 @@
 	$(GTKSHARP_LIBS) \
 	$(NDESK_DBUS_LIBS)
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 haldir = $(HALCALLOUTSDIR)
 hal_SCRIPTS = hal-podsleuth
 bin_SCRIPTS = podsleuth
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/podsleuth.in podsleuth-20091216/src/PodSleuth.Hal/podsleuth.in
--- podsleuth-20091216.old/src/PodSleuth.Hal/podsleuth.in	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/podsleuth.in	2009-12-16 20:18:18.000000000 +0100
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-mono @prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe $@
+mono @libdir@/@PACKAGE@/PodSleuth.Hal.exe $@
 


--- NEW FILE podsleuth-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./podsleuth-make-git-snapshot.sh [COMMIT] [DATE]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local podsleuth repo to reduce clone time.

if [ -z $2 ]; then
  DATE=`date +%Y%m%d`
else
  DATE=$2
fi

DIRNAME="podsleuth-$DATE"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.gnome.org/podsleuth $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Oct 2009 22:34:06 -0000	1.6
+++ .cvsignore	16 Dec 2009 23:57:26 -0000	1.7
@@ -1 +1 @@
-podsleuth-0.6.5.tar.bz2
+podsleuth-20091216.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/podsleuth.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- podsleuth.spec	12 Nov 2009 22:51:53 -0000	1.14
+++ podsleuth.spec	16 Dec 2009 23:57:26 -0000	1.15
@@ -1,21 +1,29 @@
 %define		debug_package %{nil}
 
+%global gitdate 20091216
+%global gitcommit 49fc3d67a9ce098855204e961131a21946a95d01
+
 Name:		podsleuth
-Version:	0.6.5
-Release:	2%{?dist}
+Version:	0.6.6
+#Release:	2%{?dist}
+Release:       0.1.%{gitdate}git%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
 URL:		http://banshee-project.org/
-Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Source1:	podsleuth.conf
-Patch1:		podsleuth-0.6.2-libdir.patch
+# based on libdrm's make-git-snapshot.sh 
+# sh podsleuth-make-git-snapshot.sh <gitcommit> <gitdate>
+Source0: %{name}-%{gitdate}.tar.bz2
+#Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1:		podsleuth-0.6.6-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
+# Snapshots only
+BuildRequires: autoconf automake libtool
 Requires:	sg3_utils-libs
 Requires:	dbus
 
@@ -43,11 +51,13 @@ Development files for podsleuth.
 
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}-%{gitdate}
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
 %build
+./autogen.sh
 %configure --with-hal-callouts-dir=%{_libexecdir}
 
 # Breaks when smp flag is set
@@ -58,9 +68,6 @@ make
 %{__rm} -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dbus-1/system.d
-
 mkdir -p %{buildroot}%{_localstatedir}/cache/podsleuth
 touch %{buildroot}%{_localstatedir}/cache/podsleuth/ipod-model-table
 
@@ -84,6 +91,12 @@ touch %{buildroot}%{_localstatedir}/cach
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.6-0.1.20091216git
+- Update to git snapshot (20091216) for DeviceKit-disks integration
+  (BZ 495240)
+- Update libdir patch
+- Use upstream's dbus policy file
+
 * Thu Nov 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-2
 - Add dbus policy file to allow users at the console to re-scan
   the iPod data and to update the iPod database (BZ 533397)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Oct 2009 22:34:06 -0000	1.6
+++ sources	16 Dec 2009 23:57:26 -0000	1.7
@@ -1 +1 @@
-5cbe9c3bb199912e15f65314b4f46ca8  podsleuth-0.6.5.tar.bz2
+bd906c27fb0d4b623a25d25a05c200e8  podsleuth-20091216.tar.bz2