rpms/libdsk/devel .cvsignore, 1.3, 1.4 libdsk.spec, 1.3, 1.4 sources, 1.3, 1.4

Ian Chapman (oddsocks) fedora-extras-commits at redhat.com
Wed Jul 4 21:31:47 UTC 2007


Author: oddsocks

Update of /cvs/pkgs/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23716

Modified Files:
	.cvsignore libdsk.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdsk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Apr 2006 23:18:49 -0000	1.3
+++ .cvsignore	4 Jul 2007 21:31:11 -0000	1.4
@@ -1 +1 @@
-libdsk-1.1.9.tar.gz
+libdsk-1.1.12.tar.gz


Index: libdsk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdsk/devel/libdsk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libdsk.spec	16 Sep 2006 20:28:05 -0000	1.3
+++ libdsk.spec	4 Jul 2007 21:31:11 -0000	1.4
@@ -1,90 +1,95 @@
-Summary: Library for accessing disk images
-Name: libdsk
-Version: 1.1.9
-Release: 2%{?dist}
-License: GPL
-Group: System Environment/Libraries
-Source: http://www.seasip.demon.co.uk/Unix/LibDsk/libdsk-%{version}.tar.gz
-URL: http://www.seasip.demon.co.uk/Unix/LibDsk/
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: zlib-devel, bzip2-devel
+Name:           libdsk
+Version:        1.1.12
+Release:        1%{?dist}
+Summary:        Library for accessing disk images
+Group:          System Environment/Libraries
+License:        GPL
+URL:            http://www.seasip.demon.co.uk/Unix/LibDsk
+Source0:        http://www.seasip.demon.co.uk/Unix/LibDsk/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
 
 %description
 A library for accessing disk images, particularly for use with emulators.
 
+
 %package devel
-Summary: Development files for libdsk
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary:    Development files for libdsk
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
 
 %description devel
 Development files for libdsk.
 
+
 %package tools
-Summary: Tools for use with libdsk
-Group: Applications/System
-Requires: libdsk = %{version}
+Summary:    Tools for use with libdsk
+Group:      Applications/System
+Requires:   %{name} = %{version}
 
 %description tools
 Tools for use with libdsk.
 
+
 %prep
 %setup -q
 
 # Fix dodgy permissions on files that end up in debuginfo package
-/usr/bin/find . -name '*.[ch]' | /usr/bin/xargs %{__chmod} 644
+find . -name '*.[ch]' | xargs chmod 0644
+
+# EOL fixes for files that end up in the debuginfo package
+sed -i 's/\r//' lib/*.h
+
+# Character encoding fixes
+iconv -f iso8859-1 doc/libdsk.txt -t utf8 > doc/libdsk.conv \
+    && /bin/mv -f doc/libdsk.conv doc/libdsk.txt
 
-# Fix wrong line endings on files that end up in debuginfo package
-%{__perl} -pi -e 's/\r*$//' lib/drivers.h
 
 %build
 %configure --disable-rpath --disable-static
+make %{?_smp_mflags}
 
-# Is this actually needed?
-#{__perl} -pi -e "s,hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=\" -D__LIBTOOL_IS_A_FOOL__ \",g" libtool
-
-%{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+
+%clean
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %{_libdir}/libdsk.so.*
-%doc README doc/COPYING ChangeLog TODO doc/*.html doc/libdsk.{pdf,txt}
+%doc doc/COPYING ChangeLog TODO doc/libdsk.{pdf,txt}
+
 
 %files tools
-%{_bindir}/dskform
-%{_bindir}/dskid
-%{_bindir}/dsktrans
-%{_bindir}/md3serial
-%{_bindir}/dskdump
-%{_bindir}/dskscan
-%{_bindir}/dskutil
-%{_mandir}/man1/dskutil.1*
-%{_mandir}/man1/dskdump.1*
-%{_mandir}/man1/dskscan.1*
-%{_mandir}/man1/dskform.1*
-%{_mandir}/man1/dskid.1*
-%{_mandir}/man1/dsktrans.1*
-%{_mandir}/man5/libdskrc.5*
-%{_mandir}/man1/md3serial.1*
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libdsk.so
 %{_includedir}/libdsk.h
 %exclude %{_libdir}/libdsk.la
+%doc doc/cfi.html doc/apridisk.html doc/protocol.txt
+
 
 %changelog
+* Wed Jul 04 2007 Ian Chapman <packages at amiga-hardware.com> 1.1.12-1%{?dist}
+- Upgrade to 1.1.12
+- Removed some extraneous 'docs'
+- Moved some docs to the devel sub package
+
 * Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.9-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdsk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Apr 2006 23:18:49 -0000	1.3
+++ sources	4 Jul 2007 21:31:11 -0000	1.4
@@ -1 +1 @@
-a773876031e3a0813f36e76214d73753  libdsk-1.1.9.tar.gz
+a2e3faaab891b6a21b963123a190e662  libdsk-1.1.12.tar.gz




More information about the scm-commits mailing list