]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
dbus-glib: Cleanup package
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Sep 2016 15:33:43 +0000 (11:33 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Sep 2016 16:23:11 +0000 (12:23 -0400)
This package installed libraries in /lib instead of /usr/lib

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
dbus-glib/dbus-glib.nm

index 59d6680f425a7b0494a8f468319864690ae2b840..39030350343dbf50d251773d8db3072ea411e4e1 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = dbus-glib
 version    = 0.94
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = http://www.freedesktop.org/software/dbus/
@@ -28,27 +28,18 @@ build
                glib2-devel
        end
 
+       export LD_LIBRARY_PATH = %{DIR_APP}/dbus/.libs
+
        configure_options += \
-               --sysconfdir=/etc \
-               --libdir=/%{lib} \
-               --libexecdir=%{libdir} \
-               --mandir=/usr/share/man
+               --libexecdir=%{libdir}
 
        test
                make check
        end
-
-       install_cmds
-               mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
-
-               rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so
-               ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so
-       end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL