Merge pull request elrepo#26 from amyagi/master

bumblebee spec update

bumblebee/el6/bumblebee.spec

@@ -1,47 +1,50 @@
 Name: bumblebee		
 Version: 3.0	
-Release:	2%{?dist}
+Release: 2%{?dist}
 Summary: Bumblebee is a project that enables Linux to utilize the Nvidia Optimus Hybrid cards.
-
 Group: System Environment/Daemons		
-License: GPL	
+License: GPLv3	
 URL: https://github.com/Bumblebee-Project		
-Source0: bumblebee-%{version}.tar.gz	
-Source1: bumblebeed
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: libbsd pkgconfig autoconf help2man glib2-devel libX11-devel
+BuildRequires: libbsd pkgconfig autoconf
 Requires: libbsd 	
 
+# Sources
+Source0: %{name}-%{version}.tar.gz	
+Source1: bumblebeed
+Source5: GPL-v3.0.txt
+
 %description
-Bumblebee is a project that enables Linux to utilize the Nvidia Optimus Hybrid cards.
+The %{name} package is a project that enables Linux to utilize 
+the Nvidia Optimus Hybrid cards.
 
 %prep
-%setup -q -n bumblebee-%{version}
-
+%setup -q -n %{name}-%{version}
+%{__cp} -a %{SOURCE5} .
 
 %build
 %configure \
 	--prefix=/usr \
-	 --sysconfdir=/etc
-make %{?_smp_mflags}
-
+	--sysconfdir=/etc
+%{__make} -s %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-%{__install} -D -m 0755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/bumblebeed
+%{__make} -s install DESTDIR="%{buildroot}"
+%{__install} -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/bumlebeed
+%{__install} -d %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
+%{__install} GPL-v3.0.txt %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
+
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
-%doc
+%doc /usr/share/doc/%{name}-%{version}/GPL-v3.0.txt
 %dir /etc/bumblebee
 %dir /usr/share/doc/bumblebee
 %{_sbindir}/bumblebeed
 %{_bindir}/bumblebee-bugreport
+%{_initrddir}/bumlebeed
 %attr (644, root, root) /etc/bash_completion.d/bumblebee
 %attr (644, root, root) /etc/bumblebee/bumblebee.conf
 %attr (644, root, root) /etc/bumblebee/xorg.conf.nouveau
@@ -51,17 +54,15 @@ rm -rf %{buildroot}
 %attr (644, root, root) /usr/share/doc/bumblebee/RELEASE_NOTES_3_0
 %attr (644, root, root) /usr/share/man/man1/bumblebeed.1.gz
 %attr (644, root, root) /usr/share/man/man1/optirun.1.gz
-%attr (755, root, root) /etc/init.d/bumblebeed
 
 %post
 chkconfig --add bumblebeed
 chkconfig bumblebeed on
 
 %changelog
-* Sat Mar 03 2012 Rob Mokkink <rob@mokkinksystems.com> - 3.0.2
-- modified the spec file, so that help2man, glib2-devel and libX11-devel ar needed
-- modified the install section in the spec file, so the sysvinit script get's included and included the file in the files section
-- modified the sysvinit script
+* Tue Mar 06 2012 Rob Mokkink <rob@mokkinksystems.com> - 3.0-2
+- ELRepo standards [Akemi Yagi]
+- Add GPLv3 license file
 
-* Sun Feb 26 2012 Rob Mokkink rob@mokkinksystems.com - 3.0.1
+* Sun Feb 26 2012 Rob Mokkink <rob@mokkinksystems.com> - 3.0-1
 - initial version