1.1 --- a/libcdio/libcdio.spec Fri Mar 11 21:30:26 2011 +0100 1.2 +++ b/libcdio/libcdio.spec Fri Mar 11 21:36:51 2011 +0100 1.3 @@ -1,84 +1,85 @@ 1.4 -Name: libcdio 1.5 -Version: 0.82 1.6 -Release: 3%{?dist} 1.7 -Summary: CD-ROM input and control library 1.8 -Group: System Environment/Libraries 1.9 -License: GPLv3+ 1.10 -URL: http://www.gnu.org/software/libcdio/ 1.11 -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz 1.12 -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz.sig 1.13 -Source2: libcdio-no_date_footer.hml 1.14 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 1.15 -BuildRequires: pkgconfig doxygen 1.16 -BuildRequires: ncurses-devel 1.17 -BuildRequires: help2man 1.18 -Requires(post): /sbin/ldconfig 1.19 -Requires(post): /sbin/install-info 1.20 -Requires(preun): /sbin/install-info 1.21 -BuildRequires: gettext-devel 1.22 -BuildRequires: chrpath 1.23 - 1.24 +Name: libcdio 1.25 +Version: 0.82 1.26 +Release: 20101201 1.27 +Summary: CD-ROM input and control library 1.28 +Vendor: Europalab Software 1.29 +Packager: Michael Schloh von Bennewitz 1.30 +Distribution: MeeGo Thirdparty 1.31 +Group: System Environment/Libraries 1.32 +License: GPLv3+ 1.33 +URL: http://www.gnu.org/software/libcdio/ 1.34 +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz 1.35 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 1.36 +BuildRequires: pkgconfig doxygen 1.37 +BuildRequires: ncurses-devel 1.38 +BuildRequires: help2man 1.39 +Requires(post): /sbin/ldconfig 1.40 +Requires(post): info 1.41 +Requires(preun): info 1.42 +BuildRequires: gettext-devel, chrpath 1.43 1.44 %description 1.45 -This library provides an interface for CD-ROM access. It can be used 1.46 -by applications that need OS- and device-independent access to CD-ROM 1.47 +The libcdio library provides an interface for CD-ROM access. It can be 1.48 +used by applications that need OS and device independent access to CD-ROM 1.49 devices. 1.50 1.51 %package devel 1.52 -Summary: Header files and libraries for %{name} 1.53 -Group: Development/Libraries 1.54 +Summary: Header files and libraries for %{name} 1.55 +Vendor: Europalab Software 1.56 +Packager: Michael Schloh von Bennewitz 1.57 +Distribution: MeeGo Thirdparty 1.58 +Group: Development/Libraries 1.59 Requires: %{name} = %{version}-%{release} 1.60 1.61 %description devel 1.62 -This package contains header files and libraries for %{name}. 1.63 - 1.64 +The libcdio library provides an interface for CD-ROM access. It can be 1.65 +used by applications that need OS and device independent access to CD-ROM 1.66 +devices. This package contains header files and libraries for %{name}. 1.67 1.68 %prep 1.69 %setup -q 1.70 1.71 -f=src/cd-paranoia/doc/ja/cd-paranoia.1.in 1.72 -iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f 1.73 -iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS 1.74 - 1.75 %build 1.76 %configure \ 1.77 - --disable-vcd-info \ 1.78 - --disable-dependency-tracking \ 1.79 - --disable-cddb \ 1.80 - --disable-static \ 1.81 - --disable-rpath 1.82 -make %{?_smp_mflags} 1.83 + --disable-vcd-info \ 1.84 + --disable-dependency-tracking \ 1.85 + --disable-cddb \ 1.86 + --disable-static \ 1.87 + --disable-rpath 1.88 +%{__make} %{?_smp_mflags} 1.89 1.90 -# another multilib fix; remove the architecture information from version.h 1.91 +# remove architecture information from version.h 1.92 sed -i -e "s,%{version}.*$,%{version}\\\",g" include/cdio/version.h 1.93 1.94 cd doc/doxygen 1.95 -sed -i -e "s,HTML_FOOTER.*$,HTML_FOOTER = libcdio-no_date_footer.hml,g" Doxyfile 1.96 -cp %{SOURCE2} . 1.97 ./run_doxygen 1.98 1.99 %install 1.100 rm -rf $RPM_BUILD_ROOT 1.101 -make install DESTDIR=$RPM_BUILD_ROOT 1.102 +%{__make} install DESTDIR=$RPM_BUILD_ROOT 1.103 1.104 +mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} 1.105 rm -f $RPM_BUILD_ROOT%{_infodir}/dir 1.106 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' 1.107 1.108 -mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} 1.109 +# install documentation 1.110 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html 1.111 +%{__install} -m 644 doc/doxygen/html/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html/ 1.112 1.113 -rm -rf examples 1.114 -mkdir -p examples/C++ 1.115 -cp -a example/{*.c,README} examples 1.116 -cp -a example/C++/{*.cpp,README} examples/C++ 1.117 +# install examples 1.118 +rm -rf examples && mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/C++/OO 1.119 +%{__install} -m 644 example/{*.c,README} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/ 1.120 +%{__install} -m 644 example/C++/{*.cpp,README} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/C++/ 1.121 +%{__install} -m 644 example/C++/OO/*.cpp $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/C++/OO/ 1.122 1.123 # fix timestamps of generated man-pages 1.124 for i in cd-info iso-read iso-info cd-read cd-drive; do 1.125 - # remove build architecture information from man pages 1.126 - sed -i -e 's, version.*linux-gnu,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 1.127 - # remove libtool leftover from man pages 1.128 - sed -i -e 's,lt-,,g;s,LT-,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 1.129 - # fix timestamps to be the same in all packages 1.130 - touch -r src/$i.help2man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 1.131 + # remove build architecture information from man pages 1.132 + sed -i -e 's, version.*linux-gnu,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 1.133 + # remove libtool leftover from man pages 1.134 + sed -i -e 's,lt-,,g;s,LT-,,g' $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 1.135 + # fix timestamps to be the same in all packages 1.136 + touch -r src/$i.help2man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 1.137 done 1.138 1.139 # remove rpath 1.140 @@ -88,29 +89,26 @@ 1.141 %check 1.142 # disable test using local CDROM 1.143 %{__sed} -i -e "s,testiso9660\$(EXEEXT),,g" \ 1.144 - -e "s,testisocd\$(EXEEXT),,g" \ 1.145 - -e "s,check_paranoia.sh check_opts.sh, check_opts.sh,g" \ 1.146 - test/Makefile 1.147 -make check 1.148 - 1.149 + -e "s,testisocd\$(EXEEXT),,g" \ 1.150 + -e "s,check_paranoia.sh check_opts.sh, check_opts.sh,g" \ 1.151 + test/Makefile 1.152 +%{__make} check 1.153 1.154 %clean 1.155 rm -rf $RPM_BUILD_ROOT 1.156 1.157 - 1.158 %post 1.159 /sbin/ldconfig 1.160 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : 1.161 1.162 %preun 1.163 if [ $1 = 0 ]; then 1.164 - /sbin/install-info --delete %{_infodir}/%{name}.info \ 1.165 - %{_infodir}/dir 2>/dev/null || : 1.166 + /sbin/install-info --delete %{_infodir}/%{name}.info \ 1.167 + %{_infodir}/dir 2>/dev/null || : 1.168 fi 1.169 1.170 %postun -p /sbin/ldconfig 1.171 1.172 - 1.173 %files 1.174 %defattr(-,root,root,-) 1.175 %doc AUTHORS COPYING NEWS README README.libcdio THANKS TODO 1.176 @@ -120,17 +118,19 @@ 1.177 %{_mandir}/man1/* 1.178 %lang(ja) %{_mandir}/ja/man1/* 1.179 1.180 - 1.181 %files devel 1.182 %defattr(-,root,root,-) 1.183 -%doc doc/doxygen/html examples 1.184 %{_includedir}/cdio 1.185 %{_includedir}/cdio++ 1.186 %{_libdir}/*.so 1.187 %{_libdir}/pkgconfig/*.pc 1.188 - 1.189 +%{_datadir}/doc/%{name}/html 1.190 +%{_datadir}/doc/%{name}/examples 1.191 1.192 %changelog 1.193 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 0.82-20101201 1.194 +- Adjust packaging and patch logic 1.195 + 1.196 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 0.82-3 1.197 - Build for MeeGo 1.1 1.198