1
0

Accepting request 105633 from filesystems

- Libraries back to %{_libdir}, /usr merge project. (forwarded request 105583 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/105633
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ntfs-3g_ntfsprogs?expand=0&rev=6
This commit is contained in:
Stephan Kulow 2012-02-17 11:07:00 +00:00 committed by Git OBS Bridge
commit 0eea16232c
2 changed files with 9 additions and 7 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 16 21:09:25 UTC 2012 - crrodriguez@opensuse.org
- Libraries back to %{_libdir}, /usr merge project.
-------------------------------------------------------------------
Sat Jan 28 16:44:49 UTC 2012 - tabraham@novell.com

View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: ntfs-3g_ntfsprogs
Summary: NTFS Support in Userspace
License: GPL-2.0+
@ -99,16 +100,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:
#
CFLAGS="$RPM_OPT_FLAGS -Wformat -Wformat-security -W -Wno-sign-compare" \
%configure --exec-prefix=/ --disable-static --with-pic --libdir=/%{_lib} --disable-ldconfig
%configure --exec-prefix=/ --disable-static --with-pic --disable-ldconfig
make %{?jobs:-j%jobs}
%install
%makeinstall
# Move pkg-config to the real libdir
%{__mkdir_p} %{buildroot}%{_libdir}/pkgconfig
%{__mv} -v %{buildroot}/%{_lib}/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libntfs-3g.so) %{buildroot}%{_libdir}/libntfs-3g.so
%{__rm} -v %{buildroot}/%{_lib}/libntfs-3g.{so,la}
%{__rm} -v %{buildroot}%{_libdir}/libntfs-3g.la
# Hal stuff for mounting on hotplug.
%{__mkdir_p} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
%{__install} -m 644 %{SOURCE2} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/21-storage-ntfs-3g.fdi
@ -176,7 +173,7 @@ fi
%files -n libntfs-3g83
%defattr(-,root,root,-)
%doc COPYING.LIB
/%{_lib}/libntfs-3g.so.*
%{_libdir}/libntfs-3g.so.*
%files -n libntfs-3g-devel
%defattr(-,root,root,-)