diff --git a/ntfs-3g_ntfsprogs.changes b/ntfs-3g_ntfsprogs.changes index bdaf6d1..91e3a43 100644 --- a/ntfs-3g_ntfsprogs.changes +++ b/ntfs-3g_ntfsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 23 04:44:46 UTC 2012 - jengelh@inai.de + +- Avoid static and internal libraries - use system libfuse instead +- Avoid %makeinstall to fix installation on non-SUSE + ------------------------------------------------------------------- Sat May 26 16:37:45 UTC 2012 - jengelh@inai.de diff --git a/ntfs-3g_ntfsprogs.spec b/ntfs-3g_ntfsprogs.spec index e5c6041..8dabc98 100644 --- a/ntfs-3g_ntfsprogs.spec +++ b/ntfs-3g_ntfsprogs.spec @@ -26,7 +26,12 @@ Source: %{name}-%{version}.tar.bz2 Source1: buildall.sh Source2: 21-storage-ntfs-3g.fdi Url: http://ntfs-3g.org/ -BuildRequires: pkg-config +%if 0%{?sles_version} +BuildRequires: fuse-devel >= 2.6.0 +%else +BuildRequires: pkgconfig(fuse) >= 2.6.0 +%endif +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,11 +45,11 @@ License: GPL-2.0+ Group: System/Filesystems Provides: ntfsprogs-fuse = 1.13.1 Obsoletes: ntfsprogs-fuse < 1.13.1 +%if 0%{?suse_version} Requires(post): update-alternatives Requires(postun): update-alternatives # The build service fails to build the package because it doesn't really # understand Requires(post), so use PreReq too (see bnc#439232). -%if %defined suse_version PreReq: update-alternatives %endif %if 0%{?suse_version} > 1010 @@ -100,11 +105,12 @@ options to display the version number and usage syntax. # needs to be carefully reviewed and tested, so we do not change the code now: # export CFLAGS="$RPM_OPT_FLAGS -Wformat -Wformat-security -W -Wno-sign-compare" -%configure --exec-prefix=/ --disable-static --with-pic --disable-ldconfig +%configure --exec-prefix=/ --disable-static --with-pic --disable-ldconfig \ + --with-fuse=external make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" %{__rm} -v %{buildroot}%{_libdir}/libntfs-3g.la # Hal stuff for mounting on hotplug. %{__mkdir_p} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/