Compare commits
No commits in common. "master" and "f18" have entirely different histories.
File diff suppressed because it is too large
Load Diff
|
|
@ -1,24 +0,0 @@
|
|||
diff -up pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 pilot-link-0.12.5/libpisock/md5.c
|
||||
--- pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 2013-02-25 15:17:31.708780677 +0100
|
||||
+++ pilot-link-0.12.5/libpisock/md5.c 2013-02-25 15:15:07.771861922 +0100
|
||||
@@ -125,7 +125,7 @@ void MD5Final(UINT8 digest[16], struct M
|
||||
|
||||
byteSwap(ctx->buf, 4);
|
||||
memcpy(digest, ctx->buf, 16);
|
||||
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
|
||||
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
|
||||
}
|
||||
|
||||
#ifndef ASM_MD5
|
||||
diff -up pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 pilot-link-0.12.5/popt/popthelp.c
|
||||
--- pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 2004-08-25 17:06:39.000000000 +0200
|
||||
+++ pilot-link-0.12.5/popt/popthelp.c 2013-02-25 15:16:34.593606516 +0100
|
||||
@@ -683,7 +683,7 @@ static int showShortOptions(const struct
|
||||
s[0] = '\0';
|
||||
/*@-branchstate@*/ /* FIX: W2DO? */
|
||||
if (str == NULL) {
|
||||
- memset(s, 0, sizeof(s));
|
||||
+ memset(s, 0, sizeof(*s));
|
||||
str = s;
|
||||
}
|
||||
/*@=branchstate@*/
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -ur pilot-link-0.12.5.orig/configure pilot-link-0.12.5/configure
|
||||
--- pilot-link-0.12.5.orig/configure 2010-02-07 04:42:29.000000000 +0100
|
||||
+++ pilot-link-0.12.5/configure 2014-05-09 15:36:30.466127800 +0200
|
||||
@@ -2604,12 +2604,12 @@
|
||||
|
||||
|
||||
enable_werror=no
|
||||
-save_CFLAGS="$CFLAGS"
|
||||
-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
|
||||
-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
|
||||
-if test "x$CFLAGS" != "x$save_CFLAGS"; then
|
||||
- enable_werror="yes"
|
||||
-fi
|
||||
+#save_CFLAGS="$CFLAGS"
|
||||
+#CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
|
||||
+#CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
|
||||
+#if test "x$CFLAGS" != "x$save_CFLAGS"; then
|
||||
+# enable_werror="yes"
|
||||
+#fi
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
227
pilot-link.spec
227
pilot-link.spec
|
|
@ -1,38 +1,43 @@
|
|||
%global perl_version %(eval "`%{__perl} -V:version`"; echo $version)
|
||||
%define perl_version %(eval "`%{__perl} -V:version`"; echo $version)
|
||||
|
||||
Summary: File transfer utilities between Linux and PalmPilots
|
||||
Name: pilot-link
|
||||
Version: 0.12.5
|
||||
Release: 43%{?dist}
|
||||
Release: 13%{?dist}
|
||||
Epoch: 2
|
||||
# libpisock/md5.c Public Domain
|
||||
# libpisock/blob.c LGPLv2+
|
||||
# libpisock/contact.c GPLv2
|
||||
# kittykiller.c GPLv2+
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and Public Domain
|
||||
Group: Applications/Communications
|
||||
Summary: File transfer utilities between Linux and PalmPilots
|
||||
URL: http://www.pilot-link.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: http://downloads.pilot-link.org/%{name}-%{version}.tar.bz2
|
||||
Source1: blacklist-visor
|
||||
Source2: README.fedora
|
||||
Source3: 60-pilot.perms
|
||||
Source4: 69-pilot-link.rules
|
||||
|
||||
Patch0: pilot-link-0.12.1-var.patch
|
||||
Patch1: pilot-link-0.12.2-open.patch
|
||||
Patch2: pilot-link-0.12.3-clio.patch
|
||||
Patch3: pilot-link-0.12.5-mp.patch
|
||||
Patch4: pilot-link-0.12.5-redefinePerlsymbols.patch
|
||||
Patch5: pilot-link-0.12.5-compiler_warnings.patch
|
||||
Patch6: pilot-link-0.12.5-ftbfs-f19.patch
|
||||
Patch7: pilot-link-0.12.5-aarch64.patch
|
||||
Patch8: pilot-link-0.12.5-ftbfs-f21.patch
|
||||
Source3: blacklist-visor
|
||||
Source4: README.fedora
|
||||
Source5: 60-pilot.perms
|
||||
Source6: 69-pilot-link.rules
|
||||
|
||||
ExcludeArch: s390 s390x
|
||||
BuildRequires: gcc
|
||||
BuildRequires: perl(ExtUtils::MakeMaker), libpng-devel, readline-devel
|
||||
BuildRequires: libusb-devel, bluez-libs-devel, perl-devel, perl-generators, perl(Devel::PPPort)
|
||||
Patch4: pilot-link-0.12.1-var.patch
|
||||
Patch6: pilot-link-0.12.2-open.patch
|
||||
Patch10: pilot-link-0.12.3-clio.patch
|
||||
Patch11: pilot-link-0.12.5-mp.patch
|
||||
Patch12: pilot-link-0.12.5-redefinePerlsymbols.patch
|
||||
Patch13: pilot-link-0.12.5-compiler_warnings.patch
|
||||
|
||||
Requires: pilot-link-libs = %{epoch}:%{version}-%{release}
|
||||
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: bluez-libs-devel
|
||||
|
||||
%description
|
||||
This suite of tools allows you to upload and download programs and
|
||||
data files between a Linux/UNIX machine and the PalmPilot. It has a
|
||||
|
|
@ -46,8 +51,10 @@ Hat Linux system.
|
|||
|
||||
%package devel
|
||||
Summary: PalmPilot development header files
|
||||
Group: Development/Libraries
|
||||
Requires: pilot-link-libs = %{epoch}:%{version}-%{release}
|
||||
Requires: libpng-devel, readline-devel
|
||||
Requires: libpng-devel
|
||||
Requires: readline-devel
|
||||
|
||||
%description devel
|
||||
This package contains the development headers that are used to build
|
||||
|
|
@ -59,6 +66,7 @@ need to install pilot-link-devel.
|
|||
|
||||
%package perl
|
||||
Summary: PalmPilot utilies written in perl
|
||||
Group: Applications/Communications
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: perl(:MODULE_COMPAT_%{perl_version})
|
||||
|
||||
|
|
@ -67,6 +75,9 @@ This package contains utilities that depend on perl
|
|||
|
||||
%package libs
|
||||
Summary: PalmPilot libraries
|
||||
Group: System Environment/Libraries
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
%description libs
|
||||
Libraries for applications communicating with PalmPilot
|
||||
|
|
@ -75,15 +86,12 @@ Libraries for applications communicating with PalmPilot
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .var
|
||||
%patch1 -p1 -b .open
|
||||
%patch2 -p1 -b .clio
|
||||
%patch3 -p1 -b .mp
|
||||
%patch4 -p1 -b .symbol
|
||||
%patch5 -p1 -b .compiler
|
||||
%patch6 -p1 -b .ftbfs-f19
|
||||
%patch7 -p1 -b .aarch64
|
||||
%patch8 -p1 -b .ftbfs-f21
|
||||
%patch4 -p1 -b .var
|
||||
%patch6 -p1 -b .open
|
||||
%patch10 -p1 -b .clio
|
||||
%patch11 -p1 -b .mp
|
||||
%patch12 -p1 -b .symbol
|
||||
%patch13 -p1 -b .compiler
|
||||
iconv -f windows-1252 -t UTF8 doc/README.usb > doc/README.usb.aux
|
||||
mv doc/README.usb.aux doc/README.usb
|
||||
iconv -f windows-1252 -t UTF8 ChangeLog > ChangeLog.aux
|
||||
|
|
@ -93,31 +101,34 @@ mv NEWS.aux NEWS
|
|||
|
||||
%build
|
||||
%configure \
|
||||
--with-python=no \
|
||||
--with-itcl=no \
|
||||
--with-tk=no \
|
||||
--with-tcl=no \
|
||||
--with-java=no \
|
||||
--with-cpp=yes \
|
||||
--with-perl=yes \
|
||||
--enable-conduits \
|
||||
--enable-libusb
|
||||
--with-python=no \
|
||||
--with-itcl=no \
|
||||
--with-tk=no \
|
||||
--with-tcl=no \
|
||||
--with-java=no \
|
||||
--with-cpp=yes \
|
||||
--with-perl=yes \
|
||||
--enable-conduits \
|
||||
--enable-libusb
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
make
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} libdir=%{_libdir}
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make install DESTDIR=%{buildroot} libdir=%{_libdir}
|
||||
make install -C doc/man DESTDIR=%{buildroot} libdir=%{_libdir}
|
||||
|
||||
if test -f bindings/Perl/Makefile.PL ; then
|
||||
cd bindings/Perl
|
||||
perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
|
||||
CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS=vendor
|
||||
make -B || :
|
||||
make
|
||||
cd ../..
|
||||
cd bindings/Perl
|
||||
perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
|
||||
CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS=vendor
|
||||
make -B || :
|
||||
make
|
||||
cd ../..
|
||||
fi
|
||||
|
||||
cd bindings/Perl
|
||||
|
|
@ -142,19 +153,27 @@ rm -f %{buildroot}%{_bindir}/pilot-prc
|
|||
|
||||
# Put visor to blacklist
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
|
||||
install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor.conf
|
||||
install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor.conf
|
||||
|
||||
# put README.fedora into tree
|
||||
cp %{SOURCE2} README.fedora
|
||||
cp %{SOURCE4} README.fedora
|
||||
|
||||
# install visor configs to share/udev
|
||||
install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/pilot-link/udev
|
||||
install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev
|
||||
|
||||
# now that rules are moved out HAL, install to /lib/udev/
|
||||
install -d %{buildroot}/lib/udev/rules.d/
|
||||
install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
||||
install -p -m644 %{SOURCE6} %{buildroot}/lib/udev/rules.d/
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING ChangeLog README NEWS doc/README.usb doc/README.debugging doc/README.libusb README.fedora
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/pilot-ietf2datebook
|
||||
|
|
@ -165,12 +184,14 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
|||
%exclude %{_mandir}/man1/ietf2datebook*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_includedir}/*
|
||||
%{_datadir}/aclocal/*.m4
|
||||
|
||||
%files perl
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/pilot-ietf2datebook
|
||||
%{_bindir}/pilot-sync-plan
|
||||
%{_bindir}/pilot-undelete
|
||||
|
|
@ -179,107 +200,13 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
|||
%{perl_vendorarch}/PDA*
|
||||
|
||||
%files libs
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING
|
||||
%{_libdir}/*.so.*
|
||||
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor.conf
|
||||
/lib/udev/rules.d/69-pilot-link.rules
|
||||
|
||||
%changelog
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-42
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:0.12.5-41
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sun Jul 01 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-38
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Thu Jun 28 2018 Nikola Forró <nforro@redhat.com> - 2:0.12.5-37
|
||||
- Remove ldconfig from scriptlets
|
||||
|
||||
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-36
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Tue Feb 20 2018 Nikola Forró <nforro@redhat.com> - 2:0.12.5-35
|
||||
- Add missing gcc build dependency
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-31
|
||||
- Perl 5.26 rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 2:0.12.5-29
|
||||
- Rebuild for readline 7.x
|
||||
|
||||
* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-28
|
||||
- Perl 5.24 rebuild
|
||||
|
||||
* Tue Apr 19 2016 Nikola Forró <nforro@redhat.com> - 2:0.12.5-27
|
||||
- Add perl-devel to build dependencies
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-24
|
||||
- Perl 5.22 rebuild
|
||||
|
||||
* Wed Oct 29 2014 jchaloup <jchaloup@redhat.com> - 2:0.12.5-23
|
||||
- Add build dependency on perl(Devel::PPPort)
|
||||
resolves: #1158434
|
||||
|
||||
* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-22
|
||||
- Perl 5.20 rebuild
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 09 2014 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-19
|
||||
- resolves: #1058770
|
||||
fixed FTBFS on F21
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2:0.12.5-17
|
||||
- Perl 5.18 rebuild
|
||||
|
||||
* Wed Apr 10 2013 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-16
|
||||
- resolves: #926340
|
||||
added support for aarch64
|
||||
- cleaned .spec file
|
||||
|
||||
* Mon Feb 25 2013 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-15
|
||||
- resolves: #914386
|
||||
fixed FTBFS on F19
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
|
@ -324,7 +251,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
|||
- Resolves: #659292
|
||||
split libraries to a separate package
|
||||
|
||||
* Fri Nov 12 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-2
|
||||
* Mon Nov 12 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-2
|
||||
- Resolves: #642435
|
||||
udev rules broken for pilot-link
|
||||
|
||||
|
|
@ -441,7 +368,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
|||
- Enable Perl bindings
|
||||
- Include important docs such as README.usb
|
||||
|
||||
* Wed Aug 29 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-5
|
||||
* Tue Aug 29 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-5
|
||||
- Rebuild for selinux ppc32 issue.
|
||||
- fix open function calls
|
||||
|
||||
|
|
@ -625,7 +552,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
|||
* Wed Jun 19 2002 Than Ngo <than@redhat.com> 0.9.5-19
|
||||
- don't forcibly strip binaries
|
||||
|
||||
* Tue Jun 11 2002 Than Ngo <than@redhat.com> 0.9.5-18
|
||||
* Mon Jun 11 2002 Than Ngo <than@redhat.com> 0.9.5-18
|
||||
- get rid of tcl/tk dependency (bug #66480)
|
||||
|
||||
* Wed Jun 05 2002 Than Ngo <than@redhat.com> 0.9.5-17
|
||||
|
|
@ -727,7 +654,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
|
|||
* Thu Jan 21 1999 Bill Nottingham <notting@redhat.com>
|
||||
- arm fix
|
||||
|
||||
* Thu Sep 24 1998 Michael Maher <mike@redhat.com>
|
||||
* Fri Sep 24 1998 Michael Maher <mike@redhat.com>
|
||||
- cleaned up spec file, updated package
|
||||
|
||||
* Tue May 19 1998 Michael Maher <mike@redhat.com>
|
||||
|
|
|
|||
Loading…
Reference in New Issue