rpms/lineak-defaultplugin/devel install_dirs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lineak-defaultplugin.spec, 1.1, 1.2 sources, 1.2, 1.3

[Chris Petersen (xris)]

Author: xris

Update of /cvs/extras/rpms/lineak-defaultplugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15737

Modified Files:
	.cvsignore lineak-defaultplugin.spec sources 
Added Files:
	install_dirs.patch 
Log Message:
New version of lineak-defaultplugin

install_dirs.patch:

--- NEW FILE install_dirs.patch ---
--- default_plugin/Makefile.in	2006-05-25 23:36:49.000000000 -0700
+++ default_plugin/Makefile.in	2006-05-25 23:37:31.000000000 -0700
@@ -616,15 +616,15 @@
 install-data-local:
 #>- 	$(mkinstalldirs) ${DESTDIR}$(sysconfdir)/
 #>+ 1
-	$(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/
+	$(mkinstalldirs) ${DESTDIR}$(sysconfdir)/
 #>- 	$(INSTALL_DATA) $(top_srcdir)/media-detect.conf ${DESTDIR}$(sysconfdir)/media-detect.conf
 #>+ 1
-	$(INSTALL_DATA) $(top_srcdir)/media-detect.conf $(DESTDIR)${DESTDIR}$(sysconfdir)/media-detect.conf
+	$(INSTALL_DATA) $(top_srcdir)/media-detect.conf ${DESTDIR}$(sysconfdir)/media-detect.conf
 
 uninstall-local:
 #>- 	-rm -f ${DESTDIR}$(sysconfdir)/media-detect.conf
 #>+ 1
-	-rm -f $(DESTDIR)${DESTDIR}$(sysconfdir)/media-detect.conf
+	-rm -f ${DESTDIR}$(sysconfdir)/media-detect.conf
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 May 2006 05:39:57 -0000	1.2
+++ .cvsignore	3 Jun 2006 08:25:11 -0000	1.3
@@ -1 +1 @@
-lineak_defaultplugin-0.8.4.tar.gz
+lineak-defaultplugin-0.9.tar.gz


Index: lineak-defaultplugin.spec
===================================================================
RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/lineak-defaultplugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lineak-defaultplugin.spec	24 May 2006 05:39:57 -0000	1.1
+++ lineak-defaultplugin.spec	3 Jun 2006 08:25:11 -0000	1.2
@@ -3,8 +3,8 @@
 #
 
 Name:           lineak-defaultplugin
-Version:        0.8.4
-Release:        5%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        This is the default plugin for the lineakd keyboard daemon
 
 Group:          User Interface/Desktops
@@ -13,7 +13,9 @@
 
 ################################################################################
 
-Source:         http://dl.sourceforge.net/lineak/lineak_defaultplugin-%{version}.tar.gz
+Source:         http://dl.sourceforge.net/lineak/%{name}-%{version}.tar.gz
+
+Patch:          install_dirs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,8 +28,7 @@
 
 Requires:       lineakd              = %{version}
 
-Obsoletes:      lineak_defaultplugin <= %{version}
-Provides:       lineak_defaultplugin  = %{version}
+Obsoletes:      lineak_defaultplugin
 
 ################################################################################
 
@@ -39,7 +40,9 @@
 
 %prep
 
-%setup -q -n lineak_defaultplugin-%{version}
+%setup -q
+
+%patch
 
 ################################################################################
 
@@ -77,6 +80,11 @@
 
 %changelog
 
+* Thu May 25 2006   Chris Petersen <rpm at forevermore.net>                  0.9-1
+- Preliminary build for 0.9
+- Yay, no more underscores
+- Needs a patch to fix some installation directories
+
 * Tue May 23 2006   Chris Petersen <rpm at forevermore.net>                0.8.4-5
 - Add BuildRequires: libxkbfile-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 May 2006 05:39:57 -0000	1.2
+++ sources	3 Jun 2006 08:25:11 -0000	1.3
@@ -1 +1 @@
-336b4fa5aa40b1166c2aa5418740357b  lineak_defaultplugin-0.8.4.tar.gz
+425df8c225c1a079a4ed1f221d2a5479  lineak-defaultplugin-0.9.tar.gz