diff options
| -rw-r--r-- | packages/rpm/ndpi.spec.in | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/packages/rpm/ndpi.spec.in b/packages/rpm/ndpi.spec.in index b2e2d9827..690ca5abe 100644 --- a/packages/rpm/ndpi.spec.in +++ b/packages/rpm/ndpi.spec.in @@ -49,9 +49,9 @@ you will need to install %{name}-dev. PATH=/usr/bin:/bin:/usr/sbin:/sbin %define includedir /usr/include/ndpi -%{?el7:%define libdir /usr/lib} -%{?el8:%define libdir /usr/lib64} -%{?el9:%define libdir /usr/lib64} +%{?el7:%define libdir /lib} +%{?el8:%define libdir /lib64} +%{?el9:%define libdir /lib64} %define bindir /usr/bin %install @@ -60,20 +60,19 @@ if [ -d $RPM_BUILD_ROOT ]; then \rm -rf $RPM_BUILD_ROOT fi mkdir -p $RPM_BUILD_ROOT%{includedir} -mkdir -p $RPM_BUILD_ROOT%{libdir} +mkdir -p $RPM_BUILD_ROOT%{libdir}/pkgconfig mkdir -p $RPM_BUILD_ROOT%{bindir} cd $HOME/nDPI; make DESTDIR=$RPM_BUILD_ROOT install; -rm -f $RPM_BUILD_ROOT/usr/lib/libndpi.so -rm -f $RPM_BUILD_ROOT/usr/lib/libndpi.so.? -rm -rf $RPM_BUILD_ROOT/lib -cd $RPM_BUILD_ROOT/usr/lib/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so.@MAJOR_RELEASE@; cd - -cd $RPM_BUILD_ROOT/usr/lib/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so; cd - +cp $HOME/nDPI/libndpi.pc $RPM_BUILD_ROOT%{libdir}/pkgconfig +#cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so.@MAJOR_RELEASE@; cd - +#cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so; cd - mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d cp $HOME/nDPI/packages/etc/ld.so.conf.d/ndpi.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d rm -rf $RPM_BUILD_ROOT/usr/sbin/ndpi strip $RPM_BUILD_ROOT%{bindir}/* rm -fr %{buildroot}%{includedir}/ndpi_win32.h -#sed -i -e "s/#include \"ndpi_win32.h\"//g" %{buildroot}%{includedir}/ndpi_main.h +if test -f $RPM_BUILD_ROOT/usr/lib64/pkgconfig/libndpi.pc; then /bin/rm -f $RPM_BUILD_ROOT/usr/lib64/pkgconfig/libndpi.pc; fi +if test -f $RPM_BUILD_ROOT/usr/lib/pkgconfig/libndpi.pc; then /bin/rm -f $RPM_BUILD_ROOT/usr/lib/pkgconfig/libndpi.pc; fi %clean rm -fr $RPM_BUILD_ROOT @@ -81,9 +80,9 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root) -/usr/lib/libndpi.so -/usr/lib/libndpi.so.@MAJOR_RELEASE@ -#/usr/lib/libndpi.so.@PACKAGE_VERSION@ +%{libdir}/libndpi.so +%{libdir}/libndpi.so.@MAJOR_RELEASE@ +%{libdir}/libndpi.so.@PACKAGE_VERSION@ /usr/bin/ndpiReader /usr/share/ndpi/ndpiCustomCategory.txt /usr/share/ndpi/ndpiProtos.txt @@ -96,7 +95,7 @@ rm -fr $RPM_BUILD_ROOT %defattr(-,root,root,-) %{includedir} -#/usr/lib/libndpi.a +%{libdir}/libndpi.a %changelog * Mon Nov 19 2018 Alfredo Cardigliano <cardigliano@ntop.org> 2.5 |