diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8211a34..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libifp -# $Id$ -NAME := libifp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/changelog b/changelog new file mode 100644 index 0000000..e5565fa --- /dev/null +++ b/changelog @@ -0,0 +1,122 @@ +* Thu Jul 20 2023 Fedora Release Engineering - 1.0.0.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.0.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.0.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.0.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.0.0.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.0.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.0.0.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.0.0.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.0.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.0.0.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.0.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.0.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.0.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.0.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.0.0.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.0.0.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Conrad Meyer - 1.0.0.2-20 +- Move udev rules from /etc to /usr/lib (rh #1226691) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.0.0.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.0.0.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.0.0.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Oct 28 2013 Conrad Meyer - 1.0.0.2-16 +- Update Source0 URL (sourceforge broke their download URLs again) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.0.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Apr 27 2013 Conrad Meyer - 1.0.0.2-14 +- Build with autoreconf -fiv because static copies of auto-generated scripts + are fucking dumb +- Fix rh #925775 +- add BR: autoconf, automake, libtool +- Patch configure.in which breaks with newer autotools + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.0.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.0.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.0.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.0.0.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 18 2008 Fedora Release Engineering - 1.0.0.2-7 +- Autorebuild for GCC 4.3 + +* Sun Aug 26 2007 Aurelien Bompard 1.0.0.2-6 +- rebuild for BuildID +- fix license tag + +* Thu Jul 05 2007 Aurelien Bompard 1.0.0.2-5 +- update udev rules to newer syntax (bug 246844) + +* Thu Oct 05 2006 Christian Iseli 1.0.0.2-4 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Fri Sep 22 2006 Aurelien Bompard 1.0.0.2-3 +- rebuild + +* Mon Feb 13 2006 Ignacio Vazquez-Abrams 1.0.0.2-2 +- Rebuild for Fedora Extras 5 + +* Mon Aug 22 2005 Ignacio Vazquez-Abrams 1.0.0.2-1 +- Upstream update +- Disabled build of static libraries + +* Thu Jul 14 2005 Ignacio Vazquez-Abrams 1.0.0.1-2 +- Modified for new udev + +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + +* Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 +- Initial RPM release diff --git a/libifp-1.0.0.2-fix-broken-configure-again.diff b/libifp-1.0.0.2-fix-broken-configure-again.diff new file mode 100644 index 0000000..b711b70 --- /dev/null +++ b/libifp-1.0.0.2-fix-broken-configure-again.diff @@ -0,0 +1,11 @@ +--- libifp-1.0.0.2/configure.in~ 2015-06-18 14:21:58.997203024 -0400 ++++ libifp-1.0.0.2/configure.in 2015-06-18 14:27:05.871746393 -0400 +@@ -3,7 +3,7 @@ + #The automake documentation says this is a no-no, but I don't understand + #what the alternative is. + #Commented out until I can find out what the portable alternative is. +-CFLAGS="-g -O2 -Wall -W -Wno-unused-parameter" ++#CFLAGS="-g -O2 -Wall -W -Wno-unused-parameter" + ##CFLAGS="-g -O2 -Wall -W" + + AM_INIT_AUTOMAKE(libifp, 1.0.0.2) diff --git a/libifp-1.0.0.2-fix-broken-configure.in.diff b/libifp-1.0.0.2-fix-broken-configure.in.diff new file mode 100644 index 0000000..49de592 --- /dev/null +++ b/libifp-1.0.0.2-fix-broken-configure.in.diff @@ -0,0 +1,70 @@ +--- configure.in.orig 2005-08-21 19:46:01.000000000 -0700 ++++ configure.in 2013-04-27 15:59:33.668866955 -0700 +@@ -6,54 +6,53 @@ + CFLAGS="-g -O2 -Wall -W -Wno-unused-parameter" + ##CFLAGS="-g -O2 -Wall -W" + + AM_INIT_AUTOMAKE(libifp, 1.0.0.2) + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_C_BIGENDIAN + AC_SUBST(LIBTOOL_DEPS) + + dnl AC_DEFINE(IFP_AUTOCONF) + + #----------------------------------------------------------------------- + build_userland=no + dnl --with-libusb=PATH + LIBUSB="" + AC_MSG_CHECKING([libusb]) + AC_ARG_WITH(libusb, + AC_HELP_STRING([--with-libusb=PATH],[libusb path (default /usr)]), + ac_libusb=$enableval, ac_libusb=no) +-if test "x${ac_libusb}" != "xno" ; then +- case ${with_libusb} in +- "" | "yes" | "YES") +- ;; +- "no" | "NO") +- use_libusb=false +- ;; +- *) +- CFLAGS="$CFLAGS -I${with_libusb}/include" +- CPPFLAGS="$CPPFLAGS -I${with_libusb}/include" +- LDFLAGS="$LDFLAGS -L${with_libusb}/lib" +- ;; +- esac +-fi ++case ${with_libusb} in ++ "" | "yes" | "YES") ++ ac_libusb=yes ++ ;; ++ "no" | "NO") ++ use_libusb=false ++ ;; ++ *) ++ CFLAGS="$CFLAGS -I${with_libusb}/include" ++ CPPFLAGS="$CPPFLAGS -I${with_libusb}/include" ++ LDFLAGS="$LDFLAGS -L${with_libusb}/lib" ++ ;; ++esac + AC_MSG_RESULT(done) + + dnl check if libusb is available + if test "x${ac_libusb}" != "xno" ; then + build_userland=yes + AC_CHECK_HEADERS(usb.h, [], + [ AC_MSG_WARN([usb.h not found, use --with-libusb=PATH]) ]; + build_userland=no ) + + ac_save_LIBS="$LIBS" + AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb"], + [ AC_MSG_WARN([libusb not found]) ]; build_userland=no ) + + dnl misc headers needed by the userland library + + AC_CHECK_FUNC(strncasecmp, [], [ AC_MSG_WARN([strncasecmp not found, not building userland library]) ]; + build_userland=no ) + + AC_CHECK_HEADERS(inttypes.h stdio.h sys/types.h wchar.h string.h time.h fts.h iconv.h, + [], [ AC_MSG_WARN([missing header, not building useland library]) ]; build_userland=no) diff --git a/libifp.spec b/libifp.spec index cb3e0fa..f8e5fe0 100644 --- a/libifp.spec +++ b/libifp.spec @@ -1,17 +1,29 @@ +# Relax due to incompatible pointer issues +%global build_type_safety_c 2 + Name: libifp Version: 1.0.0.2 -Release: 7%{?dist} -Summary: A general-purpose library-driver for iRiver's iFP portable audio players +Release: %autorelease +Summary: General-purpose library-driver for iRiver's iFP portable audio players -Group: System Environment/Base -License: GPLv2 +License: GPL-2.0-only URL: http://ifp-driver.sourceforge.net/ -Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz -Source1: libifp.hotplug -Source2: 10-libifp.rules -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source: http://downloads.sourceforge.net/project/ifp-driver/%{name}/%{version}-stable/%{name}-%{version}.tar.gz +Source: libifp.hotplug +Source: 10-libifp.rules +# autoconf-2.69 breaks configure.in (likely configure.in is the broken part) +# Upstream is dead, so fix it here: +Patch: libifp-1.0.0.2-fix-broken-configure.in.diff +Patch: libifp-1.0.0.2-fix-broken-configure-again.diff -BuildRequires: libusb-devel doxygen +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: doxygen +BuildRequires: libtool +BuildRequires: make +BuildRequires: systemd + +BuildRequires: libusb-compat-0.1-devel %description libifp is a general-purpose library-driver for iRiver's iFP (flash-based) @@ -21,7 +33,6 @@ Also included is a console app that uses the library. %package devel Summary: Headers and libraries for developing with libifp -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -29,68 +40,31 @@ This package contains headers and libraries for developing apps that use libifp. %prep -%setup -q +%autosetup %build +autoreconf -fiv %configure --with-libusb --disable-static -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; -install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/libifp-hotplug -install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-libifp.rules +%make_install -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +install -Dpm 0755 %{SOURCE1} %{buildroot}/sbin/libifp-hotplug +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/10-libifp.rules %files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -%{_bindir}/* -%{_libdir}/*.so.* -/sbin/* -%{_sysconfdir}/udev/rules.d/*.rules +%license COPYING +%doc ChangeLog README TODO +%{_bindir}/ifpline +%{_libdir}/libifp.so.4* +/sbin/libifp-hotplug +%{_udevrulesdir}/10-libifp.rules %files devel -%defattr(-,root,root,-) -%{_includedir}/*.h -%{_libdir}/*.so -%{_mandir}/man3/* +%{_includedir}/ifp.h +%{_libdir}/libifp.so +%{_mandir}/man3/ifp.h.3* %changelog -* Mon Feb 18 2008 Fedora Release Engineering - 1.0.0.2-7 -- Autorebuild for GCC 4.3 - -* Sun Aug 26 2007 Aurelien Bompard 1.0.0.2-6 -- rebuild for BuildID -- fix license tag - -* Thu Jul 05 2007 Aurelien Bompard 1.0.0.2-5 -- update udev rules to newer syntax (bug 246844) - -* Thu Oct 05 2006 Christian Iseli 1.0.0.2-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Fri Sep 22 2006 Aurelien Bompard 1.0.0.2-3 -- rebuild - -* Mon Feb 13 2006 Ignacio Vazquez-Abrams 1.0.0.2-2 -- Rebuild for Fedora Extras 5 - -* Mon Aug 22 2005 Ignacio Vazquez-Abrams 1.0.0.2-1 -- Upstream update -- Disabled build of static libraries - -* Thu Jul 14 2005 Ignacio Vazquez-Abrams 1.0.0.1-2 -- Modified for new udev - -* Thu Jul 7 2005 Ignacio Vazquez-Abrams -- Added Per Bjornsson's hotplug files - -* Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 -- Initial RPM release +%autochangelog