diff -r 4f133201e207 -r 4667f24fe848 libcdio/libcdio.spec --- a/libcdio/libcdio.spec Fri Mar 11 21:30:26 2011 +0100 +++ b/libcdio/libcdio.spec Fri Mar 11 21:36:51 2011 +0100 @@ -1,84 +1,85 @@ -Name: libcdio -Version: 0.82 -Release: 3%{?dist} -Summary: CD-ROM input and control library -Group: System Environment/Libraries -License: GPLv3+ -URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz.sig -Source2: libcdio-no_date_footer.hml -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig doxygen -BuildRequires: ncurses-devel -BuildRequires: help2man -Requires(post): /sbin/ldconfig -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -BuildRequires: gettext-devel -BuildRequires: chrpath - +Name: libcdio +Version: 0.82 +Release: 20101201 +Summary: CD-ROM input and control library +Vendor: Europalab Software +Packager: Michael Schloh von Bennewitz +Distribution: MeeGo Thirdparty +Group: System Environment/Libraries +License: GPLv3+ +URL: http://www.gnu.org/software/libcdio/ +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: pkgconfig doxygen +BuildRequires: ncurses-devel +BuildRequires: help2man +Requires(post): /sbin/ldconfig +Requires(post): info +Requires(preun): info +BuildRequires: gettext-devel, chrpath %description -This library provides an interface for CD-ROM access. It can be used -by applications that need OS- and device-independent access to CD-ROM +The libcdio library provides an interface for CD-ROM access. It can be +used by applications that need OS and device independent access to CD-ROM devices. %package devel -Summary: Header files and libraries for %{name} -Group: Development/Libraries +Summary: Header files and libraries for %{name} +Vendor: Europalab Software +Packager: Michael Schloh von Bennewitz +Distribution: MeeGo Thirdparty +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -This package contains header files and libraries for %{name}. - +The libcdio library provides an interface for CD-ROM access. It can be +used by applications that need OS and device independent access to CD-ROM +devices. This package contains header files and libraries for %{name}. %prep %setup -q -f=src/cd-paranoia/doc/ja/cd-paranoia.1.in -iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f -iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS - %build %configure \ - --disable-vcd-info \ - --disable-dependency-tracking \ - --disable-cddb \ - --disable-static \ - --disable-rpath -make %{?_smp_mflags} + --disable-vcd-info \ + --disable-dependency-tracking \ + --disable-cddb \ + --disable-static \ + --disable-rpath +%{__make} %{?_smp_mflags} -# another multilib fix; remove the architecture information from version.h +# remove architecture information from version.h sed -i -e "s,%{version}.*$,%{version}\\\",g" include/cdio/version.h cd doc/doxygen -sed -i -e "s,HTML_FOOTER.*$,HTML_FOOTER = libcdio-no_date_footer.hml,g" Doxyfile -cp %{SOURCE2} . ./run_doxygen %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} rm -f $RPM_BUILD_ROOT%{_infodir}/dir find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +# install documentation +mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html +%{__install} -m 644 doc/doxygen/html/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html/ -rm -rf examples -mkdir -p examples/C++ -cp -a example/{*.c,README} examples -cp -a example/C++/{*.cpp,README} examples/C++ +# install examples +rm -rf examples && mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/C++/OO +%{__install} -m 644 example/{*.c,README} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/ +%{__install} -m 644 example/C++/{*.cpp,README} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/C++/ +%{__install} -m 644 example/C++/OO/*.cpp $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/C++/OO/ # fix timestamps of generated man-pages for i in cd-info iso-read iso-info cd-read cd-drive; do - # remove build architecture information from man pages - sed -i -e 's, version.*linux-gnu,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 - # remove libtool leftover from man pages - sed -i -e 's,lt-,,g;s,LT-,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 - # fix timestamps to be the same in all packages - touch -r src/$i.help2man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 + # remove build architecture information from man pages + sed -i -e 's, version.*linux-gnu,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 + # remove libtool leftover from man pages + sed -i -e 's,lt-,,g;s,LT-,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 + # fix timestamps to be the same in all packages + touch -r src/$i.help2man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 done # remove rpath @@ -88,29 +89,26 @@ %check # disable test using local CDROM %{__sed} -i -e "s,testiso9660\$(EXEEXT),,g" \ - -e "s,testisocd\$(EXEEXT),,g" \ - -e "s,check_paranoia.sh check_opts.sh, check_opts.sh,g" \ - test/Makefile -make check - + -e "s,testisocd\$(EXEEXT),,g" \ + -e "s,check_paranoia.sh check_opts.sh, check_opts.sh,g" \ + test/Makefile +%{__make} check %clean rm -rf $RPM_BUILD_ROOT - %post /sbin/ldconfig /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}.info \ + %{_infodir}/dir 2>/dev/null || : fi %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README README.libcdio THANKS TODO @@ -120,17 +118,19 @@ %{_mandir}/man1/* %lang(ja) %{_mandir}/ja/man1/* - %files devel %defattr(-,root,root,-) -%doc doc/doxygen/html examples %{_includedir}/cdio %{_includedir}/cdio++ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc - +%{_datadir}/doc/%{name}/html +%{_datadir}/doc/%{name}/examples %changelog +* Wed Dec 1 2010 Michael Schloh von Bennewitz - 0.82-20101201 +- Adjust packaging and patch logic + * Mon Nov 1 2010 Kozinov Ivan - 0.82-3 - Build for MeeGo 1.1