diff --git a/.cvsignore b/.cvsignore index f640c50..b43ca5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -electronics-menu-1.0.tar.gz electronics-menu-1.0-submenu.tar.bz2 +electronics-menu-1.0.tar.gz diff --git a/electronics-menu.spec b/electronics-menu.spec index f591caf..ac03bb8 100644 --- a/electronics-menu.spec +++ b/electronics-menu.spec @@ -2,7 +2,7 @@ Name: electronics-menu Version: 1.0 -Release: 7%{?dist} +Release: 7.1%{?dist} Summary: Electronics Menu for the Desktop License: GPLv2 @@ -41,29 +41,39 @@ sed -i 's|install|install -p|g' Makefile # Fedora Specific Vendor sed -i 's||fedora-|' electronics.menu for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \ - xcircuit xsch xvpn xgra dreal graal xpat xfsm toped \ - gspiceui geda-gschem geda-gattrib ktechlab gerbv piklab; do + xcircuit xsch xvpn xgra dreal graal xpat xfsm toped pcb \ + gwave gspiceui geda-gschem geda-gattrib ktechlab gerbv piklab; do sed -i "s|fedora-$NOVENDOR|$NOVENDOR|" electronics.menu done %build + %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} + %clean %{__rm} -rf %{buildroot} + %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files diff --git a/import.log b/import.log index 83f156c..4f93bf6 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997 electronics-menu-1_0-4_fc11:HEAD:electronics-menu-1.0-4.fc11.src.rpm:1247178953 electronics-menu-1_0-6_fc11:HEAD:electronics-menu-1.0-6.fc11.src.rpm:1251484109 electronics-menu-1_0-7_fc11:HEAD:electronics-menu-1.0-7.fc11.src.rpm:1254214969 +electronics-menu-1_0-7_1_fc12:HEAD:electronics-menu-1.0-7.1.fc12.src.rpm:1257679410 diff --git a/sources b/sources index ded50eb..62f96b4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d340b07ac342c8c39029c5d70c58bdb0 electronics-menu-1.0.tar.gz 5a4eed42e706d5d5e5a55f6a7d649f85 electronics-menu-1.0-submenu.tar.bz2 +d340b07ac342c8c39029c5d70c58bdb0 electronics-menu-1.0.tar.gz