rpms/xfce-mcs-plugins-extra/F-8 xfce-mcs-plugins-extra-2.0-volman.patch, NONE, 1.1 xfce-mcs-plugins-extra.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5050/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-plugins-extra-2.0-volman.patch 
	xfce-mcs-plugins-extra.spec 
Log Message:
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings


xfce-mcs-plugins-extra-2.0-volman.patch:

--- NEW FILE xfce-mcs-plugins-extra-2.0-volman.patch ---
diff -dur xfce-mcs-plugins-extra-2.0.orig/config.h.in xfce-mcs-plugins-extra-2.0/config.h.in
--- xfce-mcs-plugins-extra-2.0.orig/config.h.in	2008-03-28 21:59:17.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/config.h.in	2008-09-04 23:18:48.000000000 +0200
@@ -86,3 +86,6 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Define the full thunar volman settings path */
+#undef VOLMAN_PATH
Nur in xfce-mcs-plugins-extra-2.0: config.h.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/configure.in xfce-mcs-plugins-extra-2.0/configure.in
--- xfce-mcs-plugins-extra-2.0.orig/configure.in	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/configure.in	2008-09-04 23:18:50.000000000 +0200
@@ -79,6 +79,17 @@
 AC_SUBST(VOLMAN_PLUGIN_DIR)
 AM_CONDITIONAL([BUILD_VOLMAN_PLUGIN], [test "x$build_volman_plugin" = "xyes"])
 
+dnl
+dnl give the thunar-volman path
+dnl
+AC_ARG_WITH([volman],
+    [AC_HELP_STRING([--with-volman=FULLPATH],
+        [Specify thunar-volman settings path (default=/usr/lib/thunar-volman/thunar-volman-settings)])],
+    [VOLMAN_PATH="$withval"],
+    [VOLMAN_PATH="/usr/lib/thunar-volman/thunar-volman-settings"])
+AC_DEFINE_UNQUOTED([VOLMAN_PATH], ["${VOLMAN_PATH}"], [Define the full thunar volman settings path])
+
+
 AC_OUTPUT([
 Makefile
 src/Makefile
Nur in xfce-mcs-plugins-extra-2.0: configure.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c xfce-mcs-plugins-extra-2.0/src/volman/volman.c
--- xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/src/volman/volman.c	2008-09-04 23:18:51.000000000 +0200
@@ -32,7 +32,7 @@
 #include <libxfce4mcs/mcs-manager.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 
-#define EXE "/usr/lib/thunar-volman/thunar-volman-settings"
+#define EXE VOLMAN_PATH
 #define ICON "gnome-dev-removable"
 
 /* static prototypes */
Nur in xfce-mcs-plugins-extra-2.0/src/volman: volman.c.orig.


--- NEW FILE xfce-mcs-plugins-extra.spec ---
Name:           xfce-mcs-plugins-extra
Version:        2.0
Release:        2%{?dist}
Summary:        Extra plugins for the Xfce mcs manager

Group:          User Interface/Desktops
License:        GPLv2
URL:            https://launchpad.net/xfce-mcs-plugins-extra
Source0:        http://archive.ubuntu.com/ubuntu/pool/universe/x/%{name}/%{name}_2.0.orig.tar.gz
Patch0:         %{name}-2.0-volman.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfce-mcs-manager-devel  >= 4.4.0, xfce4-dev-tools
BuildRequires:  gettext, perl(XML::Parser)
Requires:       xfce-mcs-manager >= 4.4.0, xfce4-session, xfdesktop, thunar-volman
# this one is optional, everything is detected at runtime
#Requires:       scim

%description
This packages provides additional configuration items to be included in the 
Xfce settings manager:
- Autostarted applications
- Menu editor
- Removable drives and media
- SCIM input method


%prep
%setup -q
%patch0 -p1 -b .volman

%build
xdt-autogen
%configure --disable-static --with-gnu-ld --with-volman=%{_libexecdir}/thunar-volman-settings
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*plugin.la
%find_lang %{name}


%post
killall -HUP xfce-mcs-manager > /dev/null || :


%postun
killall -HUP xfce-mcs-manager > /dev/null || :
#pkill -USR1 -f xfce-mcs-manager || true


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/xfce4/mcs-plugins/*_plugin.so


%changelog
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings

* Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:37:52 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:27:11 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-extra_2.0.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:37:52 -0000	1.1
+++ sources	5 Sep 2008 18:27:11 -0000	1.2
@@ -0,0 +1 @@
+979e6f001c60b47aa52fc628c7ec5ef1  xfce-mcs-plugins-extra_2.0.orig.tar.gz