remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247

- clean up spec to follow current guidelines
- don't build -tools for RHEL. Bill Nottingham patch. Resolves rhbz#586030
This commit is contained in:
Rahul Sundaram 2013-02-09 17:06:48 -05:00
parent d73c2ad396
commit a334fd9b11

View File

@ -3,6 +3,9 @@
# (see alsa-firmware), it is some complementary tools. # (see alsa-firmware), it is some complementary tools.
# Do *NOT* set it to zero or have a commented out define here, or it will not # Do *NOT* set it to zero or have a commented out define here, or it will not
# work. (RPM spec file voodoo) # work. (RPM spec file voodoo)
%if 0%{?rhel}
%global _without_tools 1
%endif
%ifarch ppc ppc64 %ifarch ppc ppc64
# sb16_csp doesn't build on PPC; see bug #219010 # sb16_csp doesn't build on PPC; see bug #219010
@ -23,7 +26,7 @@
Summary: Specialist tools for ALSA Summary: Specialist tools for ALSA
Name: alsa-tools Name: alsa-tools
Version: 1.0.26.1 Version: 1.0.26.1
Release: 2%{?dist} Release: 4%{?dist}
# Checked at least one source file from all the sub-projects contained in # Checked at least one source file from all the sub-projects contained in
# the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
@ -111,71 +114,65 @@ done
%install %install
%{__rm} -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{_datadir}/{pixmaps,applications}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/{pixmaps,applications}
for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
do do
case $i in case $i in
echomixer) echomixer)
(cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1
;; ;;
envy24control) envy24control)
(cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1
;; ;;
hdspconf) hdspconf)
(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 (cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1
;; ;;
hdspmixer) hdspmixer)
(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 (cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1
;; ;;
hwmixvolume) hwmixvolume)
(cd $i ; %makeinstall ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 (cd $i ; %makeinstall ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1
;; ;;
usx2yloader) usx2yloader)
(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 (cd $i ; %makeinstall hotplugdir=%{buildroot}%{_sysconfdir}/hotplug/usb) || exit 1
;; ;;
hdajackretask) hdajackretask)
(cd $i ; %makeinstall ; install -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 (cd $i ; %makeinstall ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1
;; ;;
*) (cd $i ; %makeinstall) || exit 1 *) (cd $i ; %makeinstall) || exit 1
esac esac
if [[ -s "${i}"/README ]] if [[ -s "${i}"/README ]]
then then
if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]]
then then
mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}"
fi fi
cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" cp "${i}"/README "%{buildroot}%{_docdir}/%{name}-%{version}/${i}"
fi fi
if [[ -s "${i}"/COPYING ]] if [[ -s "${i}"/COPYING ]]
then then
if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]]
then then
mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}"
fi fi
cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" cp "${i}"/COPYING "%{buildroot}%{_docdir}/%{name}-%{version}/${i}"
fi fi
if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then if [[ -s %{buildroot}%{_datadir}/applications/${i}.desktop ]] ; then
desktop-file-install --vendor fedora \ desktop-file-install --dir %{buildroot}%{_datadir}/applications \
--add-category "X-Fedora" \ %{buildroot}%{_datadir}/applications/${i}.desktop
--delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop
fi fi
done done
# convert hotplug stuff to udev # convert hotplug stuff to udev
rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap rm -f %{buildroot}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
mkdir -p ${RPM_BUILD_ROOT}/lib/udev mkdir -p %{buildroot}/lib/udev
mv ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/* ${RPM_BUILD_ROOT}/lib/udev mv %{buildroot}%{_sysconfdir}/hotplug/usb/* %{buildroot}/lib/udev
mkdir -p ${RPM_BUILD_ROOT}/lib/udev/rules.d mkdir -p %{buildroot}/lib/udev/rules.d
install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d
%if 0%{!?_without_tools:1} %if 0%{!?_without_tools:1}
%files %files
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version} %dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/as10k1 %doc %{_docdir}/%{name}-%{version}/as10k1
%doc %{_docdir}/%{name}-%{version}/echomixer %doc %{_docdir}/%{name}-%{version}/echomixer
@ -199,12 +196,12 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d
%{_bindir}/us428control %{_bindir}/us428control
%{_bindir}/hda-verb %{_bindir}/hda-verb
%{_bindir}/hdajackretask %{_bindir}/hdajackretask
%{_datadir}/applications/fedora-echomixer.desktop %{_datadir}/applications/echomixer.desktop
%{_datadir}/applications/fedora-envy24control.desktop %{_datadir}/applications/envy24control.desktop
%{_datadir}/applications/fedora-hdspconf.desktop %{_datadir}/applications/hdspconf.desktop
%{_datadir}/applications/fedora-hdspmixer.desktop %{_datadir}/applications/hdspmixer.desktop
%{_datadir}/applications/fedora-hwmixvolume.desktop %{_datadir}/applications/hwmixvolume.desktop
%{_datadir}/applications/fedora-hdajackretask.desktop %{_datadir}/applications/hdajackretask.desktop
%{_datadir}/man/man1/envy24control.1.gz %{_datadir}/man/man1/envy24control.1.gz
%{_datadir}/pixmaps/echomixer.png %{_datadir}/pixmaps/echomixer.png
%{_datadir}/pixmaps/envy24control.png %{_datadir}/pixmaps/envy24control.png
@ -224,7 +221,6 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d
%if 0%{!?_without_firmware:1} %if 0%{!?_without_firmware:1}
%files firmware %files firmware
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version} %dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/hdsploader %doc %{_docdir}/%{name}-%{version}/hdsploader
%doc %{_docdir}/%{name}-%{version}/mixartloader %doc %{_docdir}/%{name}-%{version}/mixartloader
@ -240,6 +236,11 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d
%endif %endif
%changelog %changelog
* Sat Feb 09 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1.0.26.1-3
- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
- clean up spec to follow current guidelines
- don't build -tools for RHEL. Bill Nottingham patch. Resolves rhbz#586030
* Fri Sep 7 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.26.1-2 * Fri Sep 7 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.26.1-2
- Fixed gtk3-devel dependency (hdajackretask) - Fixed gtk3-devel dependency (hdajackretask)
- Added description for hda-verb and hdajackretask - Added description for hda-verb and hdajackretask