Merge branch 'f13' into f12

This commit is contained in:
Nils Philippsen 2010-08-13 11:28:17 +02:00
commit bed1ba6061
3 changed files with 14 additions and 5 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
dcraw-8.99.tar.gz dcraw-9.04.tar.gz

View File

@ -1,6 +1,6 @@
Summary: Tool for decoding raw image data from digital cameras Summary: Tool for decoding raw image data from digital cameras
Name: dcraw Name: dcraw
Version: 8.99 Version: 9.04
Release: 1%{?dist} Release: 1%{?dist}
Group: Applications/Multimedia Group: Applications/Multimedia
License: GPLv2+ License: GPLv2+
@ -43,11 +43,14 @@ done
install -d -m 0755 %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 install -d -m 0755 %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1
install -m 0644 dcraw.1 %{buildroot}%{_mandir}/man1/dcraw.1 install -m 0644 dcraw.1 %{buildroot}%{_mandir}/man1/dcraw.1
# localized manpages # localized manpages
rm -f %{name}-man-files
touch %{name}-man-files
for manpage in dcraw_*.1; do for manpage in dcraw_*.1; do
lang="${manpage%.1}" lang="${manpage%.1}"
lang="${lang#dcraw_}" lang="${lang#dcraw_}"
install -d -m 0755 "%{buildroot}%{_mandir}/${lang}/man1" install -d -m 0755 "%{buildroot}%{_mandir}/${lang}/man1"
install -m 0644 "${manpage}" "%{buildroot}%{_mandir}/${lang}/man1/dcraw.1" install -m 0644 "${manpage}" "%{buildroot}%{_mandir}/${lang}/man1/dcraw.1"
echo "%%lang($lang) %%{_mandir}/${lang}/man1/*" >> %{name}-man-files
done done
%find_lang %{name} %find_lang %{name}
@ -55,13 +58,19 @@ done
%clean %clean
rm -rf %buildroot rm -rf %buildroot
%files -f %{name}.lang %files -f %{name}.lang -f %{name}-man-files
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/dcraw %{_bindir}/dcraw
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/*/man1/*
%changelog %changelog
* Tue Aug 03 2010 Nils Philippsen <nils@redhat.com> - 9.04-1
- version 9.04
* Wed Jun 02 2010 Nils Philippsen <nils@redhat.com> - 9.01-1
- version 9.01
- color man page files with %%lang()
* Fri Feb 12 2010 Nils Philippsen <nils@redhat.com> - 8.99-1 * Fri Feb 12 2010 Nils Philippsen <nils@redhat.com> - 8.99-1
- version 8.99 - version 8.99

View File

@ -1 +1 @@
b6469a5ac64ac6e974022b00f09fb465 dcraw-8.99.tar.gz b7052ef5ffe912730ad0ebe4db26e70e dcraw-9.04.tar.gz