rpms/podsleuth/F-8 podsleuth-0.6.0-sg3_utils.patch, NONE, 1.1 podsleuth-0.6.0-wapidir.patch, NONE, 1.1 podsleuth-0.6.2-libdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 podsleuth.spec, 1.1, 1.2 sources, 1.2, 1.3

Michel Alexandre Salim salimma at fedoraproject.org
Mon Aug 25 08:16:53 UTC 2008 

Author: salimma

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

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.0-sg3_utils.patch podsleuth-0.6.0-wapidir.patch 
	podsleuth-0.6.2-libdir.patch 
Log Message:
* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-2
- Apply sg3_utils patch only on F10 and above


podsleuth-0.6.0-sg3_utils.patch:

--- NEW FILE podsleuth-0.6.0-sg3_utils.patch ---
diff -uraN podsleuth-0.6.0.orig/configure podsleuth-0.6.0/configure
--- podsleuth-0.6.0.orig/configure	2007-12-18 23:22:01.000000000 +0100
+++ podsleuth-0.6.0/configure	2008-08-09 14:32:40.707682701 +0200
@@ -4261,13 +4261,13 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
-echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
+echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils2... $ECHO_C" >&6; }
 if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsgutils  $LIBS"
+LIBS="-lsgutils2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4327,7 +4327,7 @@
 #define HAVE_LIBSGUTILS 1
 _ACEOF
 
-  LIBS="-lsgutils $LIBS"
+  LIBS="-lsgutils2 $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
diff -uraN podsleuth-0.6.0.orig/src/PodSleuth/PodSleuth/ScsiReader.cs podsleuth-0.6.0/src/PodSleuth/PodSleuth/ScsiReader.cs
--- podsleuth-0.6.0.orig/src/PodSleuth/PodSleuth/ScsiReader.cs	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.0/src/PodSleuth/PodSleuth/ScsiReader.cs	2008-08-09 14:43:16.559431933 +0200
@@ -50,7 +50,7 @@
             }
         }
         
-        [DllImport("libsgutils.so.1")]
+        [DllImport("libsgutils2.so.2")]
         private static extern int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
             IntPtr resp, int mx_resp_len, int noisy, int verbose);
             
@@ -74,4 +74,4 @@
             }
         }
     }
-}
\ Intet linjeskift ved filafslutning
+}
diff -uraN podsleuth-0.6.0.orig/src/PodSleuth/PodSleuth.dll.config.in podsleuth-0.6.0/src/PodSleuth/PodSleuth.dll.config.in
--- podsleuth-0.6.0.orig/src/PodSleuth/PodSleuth.dll.config.in	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.0/src/PodSleuth/PodSleuth.dll.config.in	2008-08-09 14:42:46.522431555 +0200
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libsgutils.so.1" target="libsgutils.so.1" />
+	<dllmap dll="libsgutils2.so.2" target="libsgutils2.so.2" />
 </configuration>
 

podsleuth-0.6.0-wapidir.patch:

--- NEW FILE podsleuth-0.6.0-wapidir.patch ---
diff -ur podsleuth-0.6.0.orig/src/PodSleuth.Hal/hal-podsleuth.in podsleuth-0.6.0/src/PodSleuth.Hal/hal-podsleuth.in
--- podsleuth-0.6.0.orig/src/PodSleuth.Hal/hal-podsleuth.in	2007-09-17 19:51:40.000000000 +1200
+++ podsleuth-0.6.0/src/PodSleuth.Hal/hal-podsleuth.in	2008-05-15 13:39:33.000000000 +1200
@@ -3,6 +3,7 @@
 MONO=mono
 MONO_ARGS="--debug"
 MONO_EXEC="@libdir@/@PACKAGE@/PodSleuth.Hal.exe"
+MONO_SHARED_DIR=/tmp/.podsleuth
 
 if [ "$1" = "--update" ]; then
 	MONO_EXEC_ARGS="--update"
@@ -13,8 +14,10 @@
 DEBUG_PATH=/tmp/podsleuth-debug
 
 rm -f $DEBUG_PATH
+mkdir -p $MONO_SHARED_DIR
 
-$MONO $MONO_ARGS $MONO_EXEC $MONO_EXEC_ARGS &> $DEBUG_PATH && {
+MONO_SHARED_DIR=$MONO_SHARED_DIR $MONO $MONO_ARGS $MONO_EXEC $MONO_EXEC_ARGS &> $DEBUG_PATH && {
 	rm -f $DEBUG_PATH
+	rm -rdf $MONO_SHARED_DIR
 }
 

podsleuth-0.6.2-libdir.patch:

--- NEW FILE podsleuth-0.6.2-libdir.patch ---
--- podsleuth-0.6.2/src/PodSleuth.Hal/podsleuth.in.libdir	2008-06-04 21:27:29.000000000 -0400
+++ podsleuth-0.6.2/src/PodSleuth.Hal/podsleuth.in	2008-08-25 02:11:02.000000000 -0400
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-mono @prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe $@
+mono @libdir@/@PACKAGE@/PodSleuth.Hal.exe $@
 
--- podsleuth-0.6.2/src/PodSleuth.Hal/hal-podsleuth.in.libdir	2008-06-04 21:06:08.000000000 -0400
+++ podsleuth-0.6.2/src/PodSleuth.Hal/hal-podsleuth.in	2008-08-25 02:11:02.000000000 -0400
@@ -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"
--- podsleuth-0.6.2/src/PodSleuth.Hal/Makefile.in.libdir	2008-06-04 21:09:38.000000000 -0400
+++ podsleuth-0.6.2/src/PodSleuth.Hal/Makefile.in	2008-08-25 02:11:40.000000000 -0400
@@ -173,7 +173,7 @@
 	$(GTKSHARP_LIBS) \
 	$(NDESK_DBUS_LIBS)
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 haldir = $(HALCALLOUTSDIR)
 hal_SCRIPTS = hal-podsleuth
 bin_SCRIPTS = podsleuth
--- podsleuth-0.6.2/src/PodSleuth/Makefile.in.libdir	2008-06-04 21:09:38.000000000 -0400
+++ podsleuth-0.6.2/src/PodSleuth/Makefile.in	2008-08-25 02:11:02.000000000 -0400
@@ -167,7 +167,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))
 ASSEMBLY_EXPANDED_RES_BUILD = $(foreach res,$(ASSEMBLY_EXPANDED_RES), $(addprefix -resource:,$(res)),$(notdir $(res)))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Feb 2008 18:58:48 -0000	1.2
+++ .cvsignore	25 Aug 2008 08:16:22 -0000	1.3
@@ -1 +1 @@
-podsleuth-0.6.0.tar.bz2
+podsleuth-0.6.2.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-8/podsleuth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- podsleuth.spec	29 Feb 2008 18:58:48 -0000	1.1
+++ podsleuth.spec	25 Aug 2008 08:16:22 -0000	1.2
@@ -1,13 +1,16 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.0
-Release:	4%{?dist}
+Version:	0.6.2
+Release:	2%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
 URL:		http://banshee-project.org/PodSleuth
 Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		podsleuth-0.6.0-sg3_utils.patch
+Patch1:		podsleuth-0.6.2-libdir.patch
+Patch2:         podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 BuildRequires:	hal-devel
@@ -20,8 +23,12 @@
 # s390 s390x
 
 %description
-Podsleuth probes, identifies, and exposes properties
-and metadata bound to iPods.
+PodSleuth is a tool to discover detailed model information about an
+Apple (TM) iPod (TM). Its primary role is to be run as a callout by
+HAL [1] because root access is needed to scan the device for required
+information. When the model information is discovered, it is merged
+into HAL as properties for other applications to use.
+
 
 %package devel
 Summary: .pc file for podsleuth
@@ -30,10 +37,17 @@
 Requires:	pkgconfig
 
 %description devel
-Development files for podsleuth
+Development files for podsleuth.
+
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 10
+%patch0 -p1 -b .sg3_utils
+%endif
+%patch1 -p1 -b .libdir
+%patch2 -p1 -b .wapidir
+
 
 %build
 %configure --with-hal-callouts-dir=%{_libexecdir}
@@ -41,13 +55,16 @@
 # Breaks when smp flag is set
 make
 
+
 %install
 %{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
@@ -61,7 +78,21 @@
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
-* Mon Feb 18 2008 David Nielsen <david at lovesunix.net> - 0.6.1-4
+* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-2
+- Apply sg3_utils patch only on F10 and above
+
+* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2
+
+* Thu May 15 2008 Nigel Jones <dev at nigelj.com> - 0.6.0-6
+- SELinux Policies included as of selinux-policy-3.3.1-51
+- Update hal-podsleuth to not put .wapi in /root (bad bad thing)
+
+* Sat May 5 2008 Nigel Jones <dev at nigelj.com> - 0.6.0-5
+- Fix iPod detection w/ hal-info >= 20080313 (Closes: Bug #445611)
+- Correct last changelog entry
+
+* Mon Feb 18 2008 David Nielsen <david at lovesunix.net> - 0.6.0-4
 - Spec fixes 
 - Make exclusive arch at the request of callion
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Feb 2008 18:58:48 -0000	1.2
+++ sources	25 Aug 2008 08:16:22 -0000	1.3
@@ -1 +1 @@
-35a50aec47d5a6138e582354fb43eebe  podsleuth-0.6.0.tar.bz2
+270978711987fb52e48ec80026fd080a  podsleuth-0.6.2.tar.bz2

More information about the fedora-extras-commits mailing list