openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pck-update: better filter for processing unpackaged files

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-01-22 19:15:33 +01:00
parent 0388269d90
commit 1d80f444ec
2 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
autospec.conf.in
View File

@ -504,47 +504,47 @@ format_autoformat=0
# Set this variable to modify the rpm unpackaged file list conversion # Set this variable to modify the rpm unpackaged file list conversion
format_unpackaged_file_list="\ format_unpackaged_file_list="\
s,/usr/bin,%{_bindir}, s,^/usr/bin,%{_bindir},
s,/usr/sbin,%{_sbindir}, s,^/usr/sbin,%{_sbindir},
s,/usr/lib,%{_libdir}, s,^/usr/lib,%{_libdir},
s,/usr/libexec,%{_libexecdir}, s,^/usr/libexec,%{_libexecdir},
s,/usr/share/info,%{_infodir}, s,^/usr/share/info,%{_infodir},
s,/usr/share/man,%{_mandir}, s,^/usr/share/man,%{_mandir},
s,/usr/share,%{_datadir}, s,^/usr/share,%{_datadir},
s,/usr/include,%{_includedir}, s,^/usr/include,%{_includedir},
s,/etc,%{_sysconfdir}, s,^/etc,%{_sysconfdir},
s,/lib,%{_lib}, s,^/lib,%{_lib},
s,/lib64,%{_lib}, s,^/lib64,%{_lib},
s,/var,%{_localstatedir}, s,^/var,%{_localstatedir},
# translations for kde4 packages # translations for kde4 packages
s,/etc/opt/kde,%{_kde4_sysconfdir}, s,^/etc/opt/kde,%{_kde4_sysconfdir},
s,/opt/kde/bin,%{_kde4_bindir}, s,^/opt/kde/bin,%{_kde4_bindir},
s,/opt/kde/sbin,%{_kde4_sbindir}, s,^/opt/kde/sbin,%{_kde4_sbindir},
s,/opt/kde/include,%{_kde4_includedir}, s,^/opt/kde/include,%{_kde4_includedir},
s,/opt/kde/lib/kde4/libexec,%{_kde4_libexecdir}, s,^/opt/kde/lib/kde4/libexec,%{_kde4_libexecdir},
s,/opt/kde/lib/kde4/plugins,%{_kde4_pluginsdir}, s,^/opt/kde/lib/kde4/plugins,%{_kde4_pluginsdir},
s,/opt/kde/lib,%{_kde4_libdir}, s,^/opt/kde/lib,%{_kde4_libdir},
s,/opt/kde/share/applications,%{_kde4_xdgappsdir}, s,^/opt/kde/share/applications,%{_kde4_xdgappsdir},
s,/opt/kde/share/apps/kconf_update,%{_kde4_kconfupdatedir}, s,^/opt/kde/share/apps/kconf_update,%{_kde4_kconfupdatedir},
s,/opt/kde/share/apps,%{_kde4_datadir}, s,^/opt/kde/share/apps,%{_kde4_datadir},
s,/opt/kde/share/autostart,%{_kde4_autostartdir}, s,^/opt/kde/share/autostart,%{_kde4_autostartdir},
s,/opt/kde/share/config.kcfg,%{_kde4_kcfgdir}, s,^/opt/kde/share/config.kcfg,%{_kde4_kcfgdir},
s,/opt/kde/share/config,%config %{_kde4_configdir}, s,^/opt/kde/share/config,%config %{_kde4_configdir},
s,/opt/kde/share/dbus-1/interfaces,%{_kde4_dbusinterfacesdir}, s,^/opt/kde/share/dbus-1/interfaces,%{_kde4_dbusinterfacesdir},
s,/opt/kde/share/dbus-1/services,%{_kde4_dbusservicesdir}, s,^/opt/kde/share/dbus-1/services,%{_kde4_dbusservicesdir},
s,/opt/kde/share/desktop-directories,%{_kde4_xdgdirectorydir}, s,^/opt/kde/share/desktop-directories,%{_kde4_xdgdirectorydir},
s,/opt/kde/share/doc/HTML/en,%doc %lang(en) %{_kde4_htmldir}/en, s,^/opt/kde/share/doc/HTML/en,%doc %lang(en) %{_kde4_htmldir}/en,
s,/opt/kde/share/doc/HTML,%{_kde4_htmldir}, s,^/opt/kde/share/doc/HTML,%{_kde4_htmldir},
s,/opt/kde/share/icons,%{_kde4_icondir}, s,^/opt/kde/share/icons,%{_kde4_icondir},
s,/opt/kde/share/kde4/services,%{_kde4_servicesdir}, s,^/opt/kde/share/kde4/services,%{_kde4_servicesdir},
s,/opt/kde/share/kde4/servicetypes,%{_kde4_servicetypesdir}, s,^/opt/kde/share/kde4/servicetypes,%{_kde4_servicetypesdir},
s,/opt/kde/share/locale,%{_kde4_localedir}, s,^/opt/kde/share/locale,%{_kde4_localedir},
s,/opt/kde/share/mime/packages,%{_kde4_xdgmimedir}, s,^/opt/kde/share/mime/packages,%{_kde4_xdgmimedir},
s,/opt/kde/share/mimelnk,%{_kde4_mimedir}, s,^/opt/kde/share/mimelnk,%{_kde4_mimedir},
s,/opt/kde/share/sounds,%{_kde4_soundsdir}, s,^/opt/kde/share/sounds,%{_kde4_soundsdir},
s,/opt/kde/share/templates,%{_kde4_templatesdir}, s,^/opt/kde/share/templates,%{_kde4_templatesdir},
s,/opt/kde/share/wallpapers,%{_kde4_wallpaperdir}, s,^/opt/kde/share/wallpapers,%{_kde4_wallpaperdir},
s,/opt/kde/share,%{_kde4_sharedir}," s,^/opt/kde/share,%{_kde4_sharedir},"
# set this variable to '1' if rpm ignores the BuildRoot tag of a specfile # set this variable to '1' if rpm ignores the BuildRoot tag of a specfile
rpm_ignores_buildroot=1 rpm_ignores_buildroot=1

6
plugins/pck-update.in
View File

@ -2292,8 +2292,10 @@ It seems good but do not forget to run quality and security tests.""${NORM}"
"") skipline=1 ;; "") skipline=1 ;;
esac esac
[ "$skipline" = 1 ] || echo "$line" [ "$skipline" = 1 ] || echo "$line"
done < <(LC_ALL=C rpmbuild -bl --nobuild \ done < <(LC_ALL=C rpmbuild -bl --nodeps --nobuild \
$SRPM_SPECFILE_WITH_PATH 2>&1) > $tmpunpackfiles $SRPM_SPECFILE_WITH_PATH $USER_RPMDEFINE_OPTS 2>&1) | \
sed -e "$format_unpackaged_file_list" \
> $tmpunpackfiles
if [ -s "$tmpunpackfiles" ]; then if [ -s "$tmpunpackfiles" ]; then
notify.error $"\ notify.error $"\