[svn] r5746 - in trunk/rpms: partimage smb4k synce
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Aug 17 19:42:52 CEST 2007
Author: dag
Date: 2007-08-17 19:42:51 +0200 (Fri, 17 Aug 2007)
New Revision: 5746
Modified:
trunk/rpms/partimage/partimage.spec
trunk/rpms/smb4k/smb4k.spec
trunk/rpms/synce/synce.spec
Log:
Updates
Modified: trunk/rpms/partimage/partimage.spec
===================================================================
--- trunk/rpms/partimage/partimage.spec 2007-08-17 17:33:26 UTC (rev 5745)
+++ trunk/rpms/partimage/partimage.spec 2007-08-17 17:42:51 UTC (rev 5746)
@@ -4,7 +4,7 @@
Summary: partition imaging utility, much like Ghost
Name: partimage
-Version: 0.6.5
+Version: 0.6.6
Release: 1
License: GPL
Group: Applications/System
@@ -180,17 +180,17 @@
EOF
%build
-%configure \
- --program-prefix="%{?_program_prefix}" \
- --with-log-dir="%{_localstatedir}/log" \
- --enable-pam \
- --disable-ssl \
- --enable-gui-text \
- --enable-gui-newt \
- --enable-all-static
-%{__make} %{?_smp_mflags}
-%{__mv} -f src/client/partimage partimage-static
-%{__rm} -f src/server/partimaged
+#%configure \
+# --program-prefix="%{?_program_prefix}" \
+# --with-log-dir="%{_localstatedir}/log" \
+# --enable-pam \
+# --disable-ssl \
+# --enable-gui-text \
+# --enable-gui-newt \
+# --enable-all-static
+#%{__make} %{?_smp_mflags}
+#%{__mv} -f src/client/partimage partimage-static
+#%{__rm} -f src/server/partimaged
%configure \
--program-prefix="%{?_program_prefix}" \
@@ -205,9 +205,9 @@
%install
%{__rm} -rf %{buildroot}
%makeinstall
-%find_lang %{name}
+#%find_lang %{name}
-%{__install} -Dp -m0755 partimage-static %{buildroot}%{_sbindir}/partimage-static
+#%{__install} -Dp -m0755 partimage-static %{buildroot}%{_sbindir}/partimage-static
%{__install} -Dp -m0755 partimaged.sysv %{buildroot}%{_initrddir}/partimaged
%{__install} -Dp -m0644 partimaged.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/partimaged
@@ -241,7 +241,8 @@
%clean
%{__rm} -rf %{buildroot}
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
%defattr(-, root, root, 0755)
%doc AUTHORS BOOT* BUGS ChangeLog COPYING FUTURE README* THANKS TODO
%{_sbindir}/partimage
@@ -261,13 +262,16 @@
%dir %{_localstatedir}/partimaged/
%ghost %{_localstatedir}/log/partimaged.log
-%files static
-%defattr(-, root, root, 0755)
-%doc AUTHORS BOOT* BUGS ChangeLog COPYING FUTURE README* THANKS TODO
-%{_sbindir}/partimage-static
+#%files static
+#%defattr(-, root, root, 0755)
+#%doc AUTHORS BOOT* BUGS ChangeLog COPYING FUTURE README* THANKS TODO
+#%{_sbindir}/partimage-static
%changelog
-* Mon Dec 18 2004 Dag Wieers <dag at wieers.com> - 0.6.5-1
+* Thu Aug 16 2007 Dag Wieers <dag at wieers.com> - 0.6.6-1
+- Updated to release 0.6.6.
+
+* Mon Dec 18 2006 Dag Wieers <dag at wieers.com> - 0.6.5-1
- Updated to release 0.6.5.
* Sat Mar 06 2004 Dag Wieers <dag at wieers.com> - 0.6.4-1
Modified: trunk/rpms/smb4k/smb4k.spec
===================================================================
--- trunk/rpms/smb4k/smb4k.spec 2007-08-17 17:33:26 UTC (rev 5745)
+++ trunk/rpms/smb4k/smb4k.spec 2007-08-17 17:42:51 UTC (rev 5746)
@@ -34,14 +34,13 @@
%build
source "/etc/profile.d/qt.sh"
-%configure LDFLAGS=-L$QTLIB
+%configure LDFLAGS="-L$QTLIB"
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
source "/etc/profile.d/qt.sh"
-%{__make} install \
- DESTDIR="%{buildroot}"
+%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
%clean
Modified: trunk/rpms/synce/synce.spec
===================================================================
--- trunk/rpms/synce/synce.spec 2007-08-17 17:33:26 UTC (rev 5745)
+++ trunk/rpms/synce/synce.spec 2007-08-17 17:42:51 UTC (rev 5746)
@@ -1,29 +1,28 @@
# $Id:$
# Authority: hadams
-Name: synce
-Version: 0.9.1
-Release: 10
-Summary: Serial connection support for Pocket PC devices
+Summary: Serial connection support for Pocket PC devices
+Name: synce
+Version: 0.9.1
+Release: 10
+License: MIT
+Group: Applications/Communications
+URL: http://synce.sourceforge.net/
-Group: Applications/Communications
-License: MIT
-URL: http://synce.sourceforge.net/
-Source0: http://dl.sf.net/synce/synce-libsynce-%{version}.tar.gz
-Source1: http://dl.sf.net/synce/synce-dccm-%{version}.tar.gz
-Source2: http://dl.sf.net/synce/synce-serial-%{version}.tar.gz
-Source3: http://dl.sf.net/synce/synce-rra-%{version}.tar.gz
-Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz
-Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz
-Source6: synce.dev
-Source7: synce-README.Fedora
-Patch0: synce-rra-Makefile.patch
-Patch1: synce-rra-devel.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://dl.sf.net/synce/synce-libsynce-%{version}.tar.gz
+Source1: http://dl.sf.net/synce/synce-dccm-%{version}.tar.gz
+Source2: http://dl.sf.net/synce/synce-serial-%{version}.tar.gz
+Source3: http://dl.sf.net/synce/synce-rra-%{version}.tar.gz
+Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz
+Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz
+Source6: synce.dev
+Source7: synce-README.Fedora
+Patch0: synce-rra-Makefile.patch
+Patch1: synce-rra-devel.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: automake
-BuildRequires: libtool
-
+BuildRequires: automake
+BuildRequires: libtool
Requires: ppp
%description
@@ -33,20 +32,17 @@
available here: http://synce.sourceforge.net/
%package devel
-Summary: Development libraries and header files for SynCE
-Group: Development
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
-This package contains the header files and link libraries for SynCE
-application development. SynCE provides support for communication
-between a Windows CE device (PDA, smart phone) and a Linux machine.
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
-For more details on the SynCE project, please refer to the project's
-homepage at http://synce.sourceforge.net/
-
%prep
-%setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5
+%setup -c -a 1 -a 2 -a 3 -a 4 -a 5
%patch0
%patch1
@@ -54,39 +50,39 @@
# build libsynce
cd synce-libsynce-%{version}
%configure --disable-static --disable-rpath
-make
+%{__make}
SYNCEINC="$(pwd)/lib"
SYNCELIB="$(pwd)/lib/.libs"
-cd ..
+cd -
# build dccm
cd synce-dccm-%{version}
%configure \
--with-libsynce-include="${SYNCEINC}" \
--with-libsynce-lib="${SYNCELIB}" \
--disable-static
-make LDFLAGS="-L${SYNCEINC}"
-cd ..
+%{__make} LDFLAGS="-L${SYNCEINC}"
+cd -
# build librapi2
cd synce-librapi2-%{version}
%configure \
--with-libsynce-include="${SYNCEINC}" \
--with-libsynce-lib="${SYNCELIB}" \
- --disable-static \
- --disable-rpath
-make LDFLAGS="-L${SYNCEINC}"
+ --disable-rpath \
+ --disable-static
+%{__make} LDFLAGS="-L${SYNCEINC}"
RAPI2INC="$(pwd)/src"
RAPI2LIB="$(pwd)/src/.libs"
-cd ..
+cd -
# build libmimedir
cd libmimedir-0.4
-CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure
-make
+CFLAGS="%{optflags} -fPIC" %configure
+%{__make}
# build shared libmimedir to work around x86_64 build error
ld --shared --whole-archive libmimedir.a -o libmimedir.so
rm libmimedir.a
MIMEDIRINC="$(pwd)"
MIMEDIRLIB="$(pwd)"
-cd ..
+cd -
# build rra
cd synce-rra-%{version}
./bootstrap
@@ -97,48 +93,43 @@
--with-librapi2-lib="${RAPI2LIB}" \
--with-libmimedir-include="${MIMEDIRINC}" \
--with-libmimedir-lib="${MIMEDIRLIB}" \
- --disable-static \
- --disable-rpath
-
-make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB} --shared"
-cd ..
+ --disable-rpath \
+ --disable-static
+%{__make} LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB} --shared"
+cd -
# build the serial support
cd synce-serial-%{version}
%configure
-make
-cd ..
+%{__make}
+cd -
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
for module in libsynce dccm librapi2 rra serial ; do
- cd synce-${module}-%{version}
- %makeinstall
- cd ..
+ %{__make} -C "synce-${module}-%{version}" install DESTDIR="%{buildroot}"
done
-install -m 775 libmimedir-0.4/libmimedir.so $RPM_BUILD_ROOT/%{_libdir}/libmimedir.so
+%{__install} -Dp -m0775 libmimedir-0.4/libmimedir.so %{buildroot}%{_libdir}/libmimedir.so
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
# Enable autoconnect
-install -p -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/scripts/synce.dev
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/
-ln -s ../../udev/scripts/synce.dev $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/synce.dev
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-echo 'DRIVER=="ipaq", NAME="ipaq", SYMLINK+="ttyUSB%%n"' > \
- $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/50-ipaq.rules
-cp %{SOURCE7} README.Fedora
+%{__install} -Dp -m0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/udev/scripts/synce.dev
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/dev.d/ipaq/
+%{__ln_s} ../../udev/scripts/synce.dev %{buildroot}%{_sysconfdir}/dev.d/ipaq/synce.dev
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/udev/rules.d/
+echo 'DRIVER=="ipaq", NAME="ipaq", SYMLINK+="ttyUSB%%n"' >%{buildroot}%{_sysconfdir}/udev/rules.d/50-ipaq.rules
+%{__cp} -v %{SOURCE7} README-rpm
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,0755)
-%doc README.Fedora
+%defattr(-, root, root, 0755)
+%doc README-rpm
#libsynce
%{_libdir}/libsynce.so.0*
@@ -192,15 +183,14 @@
%{_sysconfdir}/dev.d/ipaq/
%files devel
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
%{_includedir}/*.h
%{_libdir}/lib*.so
%{_datadir}/aclocal/*.m4
%changelog
-* Sun Aug 12 2007 Heiko Adams <info at fedora-blog.de>
-0.9.1-10
-- rebuild for rpmforge
+* Sun Aug 12 2007 Heiko Adams <info at fedora-blog.de> - 0.9.1-10
+- Rebuild for RPMforge.
* Sat Nov 11 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.1-9
More information about the svn-commits
mailing list